Henry Oswald a73b2ceb37 Merge branch 'connect-failed'		2015-10-07 11:30:48 +01:00
..
coffee	bonus allocater does not need to check if user has subscription any more.	2015-10-05 16:50:34 +01:00
templates/project_files
views	Merge branch 'connect-failed'	2015-10-07 11:30:48 +01:00