Henry Oswald c0a6f0b7ad Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee public/coffee/ide/online-users/OnlineUsersManager.coffee public/coffee/ide/track-changes/directives/infiniteScroll.coffee		2014-07-10 15:15:18 +01:00
..
blog	blog intergration works	2014-07-10 14:53:53 +01:00
general
info
layout	Provide more config options for nav and footer entries	2014-07-08 12:51:11 +01:00
project	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-10 15:15:18 +01:00
referal	Style bonus page	2014-07-07 15:54:40 +01:00
subscriptions	Improve styling of project list with long titles and labels	2014-07-09 11:51:21 +01:00
templates
user	Use Angular 1.30 and only update emails on blur	2014-07-09 14:53:30 +01:00
view_templates
admin.jade
changelog.jade
layout.jade	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-10 15:15:18 +01:00
modals.jade
restore.jade
templates.jade
tests.jade