Paulo Reis 8d1736af59 Fix forgotten conflict.		2017-12-20 09:51:32 +00:00
..
brand
coffee	Merge branch 'master' into pr-style-v2-chatpane	2017-12-20 09:50:49 +00:00
font
img
js
recurly
stylesheets	Fix forgotten conflict.	2017-12-20 09:51:32 +00:00
apple-touch-icon-precomposed.png
favicon.ico
humans.txt
mask-favicon.svg
ol-favicon.ico
robots.txt
sharelatex-security.pub
touch-icon-192x192.png