Commit 82f0ebb4 authored by Henrique Dias's avatar Henrique Dias Committed by James Allen
Browse files

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

Conflicts:
	Dockerfile
parents 9a5df51e d4331f84
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