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

This commit is contained in:
Blade Barringer
2015-11-15 14:59:57 -06:00
53 changed files with 2457 additions and 54 deletions

View File

@@ -1,5 +1,5 @@
var shared = require('../../common/script/index.js');
shared.i18n.translations = require('../../website/src/libs/i18n.js').translations
shared.i18n.translations = require('../../website/src/libs/api-v2/i18n.js').translations
require('./test_helper');