Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3

This commit is contained in:
Blade Barringer
2015-12-29 08:06:22 -06:00
550 changed files with 12318 additions and 8209 deletions

View File

@@ -52,6 +52,7 @@ gulp.task('lint:common', () => {
gulp.task('lint:tests', () => {
let options = {
rules: {
'one-var': 0,
'max-nested-callbacks': 0,
'no-unused-expressions': 0,
'mocha/no-exclusive-tests': 2,