Shane Kilkelly 97a6ac0f00 Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee		2016-09-15 14:48:51 +01:00
..
admin
beta_program
blog
general
layout	wip refactor	2016-09-06 15:22:13 +01:00
project	Preserve line formatting in word count error message	2016-09-14 11:21:00 +01:00
referal
subscriptions	Also hide button, when viewing student plans.	2016-08-31 11:40:27 +01:00
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