Merge branch 'develop' into api-v3

2016-03-05 19:29:02 +01:00
parent 45e7609dd1 b553a6c134
commit b5e1cd33e2
306 changed files with 2868 additions and 2409 deletions
@@ -1,4 +1,4 @@
-// TODO cleanup all comments when finished API v3
+// TODO cleanup all comments when API v3 is finished

 import nconf from 'nconf';
 import logger from './libs/api-v3/logger';