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

@@ -130,7 +130,7 @@ module.exports = function(grunt) {
grunt.registerTask('test:prepare:translations', function() {
require('babel/register');
var i18n = require('./website/src/libs/i18n'),
var i18n = require('./website/src/libs/api-v3/i18n'),
fs = require('fs');
fs.writeFileSync('test/spec/mocks/translations.js',
"if(!window.env) window.env = {};\n" +