Shane Kilkelly 72ca1d6316 Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee		2016-09-23 10:01:11 +01:00
..
admin
beta_program
blog
general
layout	wip refactor	2016-09-06 15:22:13 +01:00
project	Merge pull request #320 from sharelatex/ja-validate-filenames	2016-09-23 09:42:48 +01:00
referal
subscriptions
translations
university
user
view_templates
contact-us-modal.jade
layout.jade	Don't redirect Google to nocdn=true, and remove canonical URL until we sort out translated domains	2016-09-15 10:21:12 +01:00
restore.jade
scribtex-modal.jade
sentry.jade
tests.jade