Shane Kilkelly 72ca1d6316 Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee		2016-09-23 10:01:11 +01:00
..
coffee	Merge branch 'master' into sk-passport	2016-09-23 10:01:11 +01:00
templates/project_files	removed old email tempaltes	2014-03-06 11:53:24 +00:00
views	Merge branch 'master' into sk-passport	2016-09-23 10:01:11 +01:00