Commit dc89ae1f authored by Shane Kilkelly's avatar Shane Kilkelly

Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image

parents 3f5a41e3 2a6ef976
......@@ -295,7 +295,14 @@ settings =
references:{}
notifications:undefined
defaultFeatures:
collaborators: -1
dropbox: true
versioning: true
compileTimeout: 180
compileGroup: "standard"
references: true
templates: true
#### OPTIONAL CONFIGERABLE SETTINGS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment