Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into memory_leak_maybe

2018-08-03 13:53:44 -05:00 · 2018-08-03 13:53:44 -05:00 · 9c500d7c4d
parent b707fb1880 217002ad58
commit 9c500d7c4d
3 changed files with 815 additions and 739 deletions
--- a/package.json
+++ b/package.json
@ -93,7 +93,7 @@
    "webpack-uglify-js-plugin": "1.1.9",
    "weinre": "^2.0.0-pre-I0Z7U9OV",
    "which": "1.3.1",
-    "yarn": "^1.7.0"
+    "yarn": "^1.9.2"
  },
  "devDependencies": {
    "jscpd": "0.6.22",
--- a/public/app-resources/languages/ru.js
+++ b/public/app-resources/languages/ru.js
--- a/yarn.lock
+++ b/yarn.lock
@ -7833,6 +7833,6 @@ yargs@~3.10.0:
    decamelize "^1.0.0"
    window-size "0.1.0"

-yarn@^1.7.0:
+yarn@^1.9.2:
  version "1.9.2"
  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.9.2.tgz#7666c6db0fed8dc090ae0dce11a8a28b1d82e391"