James Allen 9682af3981 Merge branch 'master' into ja-track-changes ...

Conflicts:
	public/coffee/ide/history/HistoryManager.coffee

2016-10-10 17:10:10 +01:00

..

coffee

don't add second slash into uni redirect

2016-10-10 15:36:12 +01:00

templates/project_files

removed old email tempaltes

2014-03-06 11:53:24 +00:00

views

Merge branch 'master' into ja-track-changes

2016-10-10 17:10:10 +01:00