Merge remote-tracking branch 'upstream/master' into texcount

This commit is contained in:
Henrique Dias
2015-09-08 09:13:04 -03:00
3 changed files with 306 additions and 0 deletions

View File

@@ -10,6 +10,7 @@ fs = require "fs"
Metrics = require "metrics-sharelatex"
Metrics.initialize("clsi")
Metrics.open_sockets.monitor(logger)
Metrics.memory.monitor(logger)
ProjectPersistenceManager = require "./app/js/ProjectPersistenceManager"
OutputCacheManager = require "./app/js/OutputCacheManager"