chris f3e40c1405 Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop ... Conflicts: Gemfile.lock vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb		2013-03-21 18:39:09 +08:00
..
built_in_modules	Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop	2013-03-21 18:39:09 +08:00
plugins	New and Announcement search. Disabled impression.	2012-07-20 15:47:40 +08:00