Merge branch 'master' into node-6.9

This commit is contained in:
Shane Kilkelly
2017-04-05 10:15:51 +01:00
339 changed files with 61714 additions and 157737 deletions
@@ -16,6 +16,7 @@ describe "ProjectGetter", ->
projects: {}
users: {}
ObjectId: ObjectId
"metrics-sharelatex": timeAsyncMethod: sinon.stub()
"../../models/Project": Project: @Project = {}
"../Collaborators/CollaboratorsHandler": @CollaboratorsHandler = {}
"logger-sharelatex":