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

Remove proprietary icons and stylesheets

2014-02-18 15:55:32 +00:00

coffee

Merge branch 'i18n'

2014-08-07 14:46:17 +01:00

font

Intial open source comment

2014-02-12 10:23:40 +00:00

img

Bring back Prof. Lion

2014-07-29 11:25:34 +01:00

js

Fix context menu in firefox on windows

2014-08-06 15:49:40 +01:00

recurly

Style subscription management pages

2014-07-07 13:43:36 +01:00

stylesheets

Include contents page down side of wiki

2014-07-31 16:26:02 +01:00

favicon.ico

Retina favicon

2014-07-23 15:56:15 +01:00

humans.txt

Intial open source comment

2014-02-12 10:23:40 +00:00

robots.txt

Intial open source comment

2014-02-12 10:23:40 +00:00

sharelatex-security.pub

Intial open source comment

2014-02-12 10:23:40 +00:00