Rueshyna 2746616610 Merge branch 'desktop_work' into desktop ... * desktop_work: app manager changed plus some changes section page fixed.. section page fixed.. add browser compatibility page Conflicts: vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb		2013-03-14 19:00:06 +08:00
..
panel/personal_journal	Merge branch 'desktop_work' into desktop	2013-03-14 19:00:06 +08:00
.gitkeep	Plugins	2012-09-14 00:05:31 +08:00