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
..
editor	Merge branch 'master' into ja-track-changes	2016-10-10 17:10:10 +01:00
invite	Use token in URL to force its precense when invite and allow easy dynamic notifications	2016-09-22 17:24:06 +01:00
list	Make project invite notification dynamic and accept via ajax request	2016-09-21 11:59:35 +01:00
editor.jade	Merge branch 'master' into ja-track-changes	2016-10-10 17:10:10 +01:00
list.jade	Remove AB-related logic from template and controller.	2016-08-30 16:10:04 +01:00