Merge branch 'develop' into api-v3

This commit is contained in:
Blade Barringer
2015-11-13 07:38:24 -06:00
326 changed files with 11948 additions and 4147 deletions

View File

@@ -8,7 +8,6 @@ import {MongoClient as mongo} from 'mongodb';
import {v4 as generateUUID} from 'uuid';
import superagent from 'superagent';
import i18n from '../../common/script/src/i18n';
require('coffee-script');
i18n.translations = require('../../website/src/libs/i18n.js').translations;
const API_TEST_SERVER_PORT = 3003;