Merge remote-tracking branch 'upstream/master' into devel

This commit is contained in:
gutfuckllc 2018-08-01 14:26:08 -04:00
commit 8df35650e5

View file

@ -178,7 +178,7 @@
"rimraf": "2.6.2", "rimraf": "2.6.2",
"rndstr": "1.0.0", "rndstr": "1.0.0",
"s-age": "1.1.2", "s-age": "1.1.2",
"sass-loader": "7.0.3", "sass-loader": "7.1.0",
"seedrandom": "2.4.3", "seedrandom": "2.4.3",
"sharp": "0.20.5", "sharp": "0.20.5",
"showdown": "1.8.6", "showdown": "1.8.6",