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
..
account-settings.coffee
group-members.coffee
plans.coffee
project-list.coffee	Auto resize project list to always fit in screen	2014-07-08 17:47:20 +01:00
templates.coffee	merge/moving js stuff around half done	2014-07-08 12:32:50 +01:00
user-details.coffee	merge/moving js stuff around half done	2014-07-08 12:32:50 +01:00