Ports https://github.com/tgstation/tgstation/pull/50497

2020-04-23 09:55:28 +03:00
parent 055606b81b
commit 80b47ec1c0
368 changed files with 29034 additions and 6568 deletions
@@ -1,6 +1,13 @@
 {
  "name": "tgui",
+<<<<<<< HEAD
  "private": true,
+=======
+  "version": "3.0.0",
+  "workspaces": [
+    "packages/*"
+  ],
+>>>>>>> 2185124... Merge pull request #50497 from stylemistake/tgui-3.0
  "scripts": {
    "build": "gulp --min",
    "watch": "gulp watch"