Harry Bomrah 96b6f7e3fd Merge branch 'desktop_design_devin' into desktop_work1 ... Conflicts: app/assets/javascripts/orbitdesktop.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb		2013-04-08 17:30:13 +08:00
..
panel/personal_journal	Merge branch 'desktop_design_devin' into desktop_work1	2013-04-08 17:30:13 +08:00
.gitkeep	Plugins	2012-09-14 00:05:31 +08:00
application_controller.rb	Plugins	2012-09-14 00:05:31 +08:00