Merge branch 'master' into develop

This commit is contained in:
Torkel Ödegaard
2017-11-24 09:25:14 +01:00
43 changed files with 1616 additions and 2405 deletions

View File

@@ -17,7 +17,7 @@
"max-line-length": [true, 150],
"member-access": false,
"no-arg": true,
"no-bitwise": true,
"no-bitwise": false,
"no-console": [true,
"debug",
"info",