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

There are no changes