Henry Oswald 6dc9d32104 Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: public/coffee/app/main.coffee		2014-07-08 11:14:56 +01:00
..
editor	- hooked up chat throughout the stack	2014-07-08 10:08:38 +01:00
editor.jade	- hooked up chat throughout the stack	2014-07-08 10:08:38 +01:00
list.jade	Get group admin page working with angular and new style	2014-07-07 18:06:12 +01:00