overleaf/services/web/app/views/templates
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
..
index.jade Merge branch 'i18n' 2014-08-07 14:46:17 +01:00
tag.jade added a load more pages 2014-08-01 12:34:53 +01:00
template.jade added a load more pages 2014-08-01 12:34:53 +01:00