Merge branch 'develop' into paglias/realtime-chat-v1

This commit is contained in:
Matteo Pagliazzi
2016-09-08 19:12:05 +02:00
53 changed files with 272 additions and 172 deletions

View File

@@ -1,4 +1,4 @@
// NOTE: this file is only used because the mobile apps expect IAP routes
// to be found at /api/v3/iap instead of /iap.
module.exports = require('../top-level/payments/iap');
module.exports = require('../top-level/payments/iap');