Shane Kilkelly 97a6ac0f00 Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee		2016-09-15 14:48:51 +01:00
..
Features	Merge branch 'master' into sk-passport	2016-09-15 14:48:51 +01:00
infrastructure	Merge branch 'master' into sk-passport	2016-09-15 14:48:51 +01:00
models	Rework how invite expiry functions.	2016-08-12 14:40:59 +01:00
router.coffee	Finalise login workflow, works with login form again.	2016-09-15 14:36:11 +01:00