Commit dc89ae1f authored by Shane Kilkelly's avatar Shane Kilkelly
Browse files

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

parents 3f5a41e3 2a6ef976
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -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