Commit 122921ba authored by ShareLaTeX's avatar ShareLaTeX
Browse files

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

Conflicts:
	settings.coffee
parents 3dbe92ce 10b6f88f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment