Henry Oswald 9c6f0faff6 Merge branch 'i18n' ... Conflicts: app/coffee/Features/User/UserPagesController.coffee app/views/layout.jade app/views/project/editor/dropbox.jade app/views/project/editor/file-tree.jade app/views/project/editor/pdf.jade app/views/project/list/project-list.jade app/views/user/settings.jade		2014-08-07 14:46:17 +01:00
..
brand
coffee	Merge branch 'i18n'	2014-08-07 14:46:17 +01:00
font
img
js	Fix context menu in firefox on windows	2014-08-06 15:49:40 +01:00
recurly
stylesheets	Include contents page down side of wiki	2014-07-31 16:26:02 +01:00
favicon.ico
humans.txt
robots.txt
sharelatex-security.pub