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
..
assets	fixed co author relation save button	2013-03-14 18:29:24 +08:00
controllers	app manager changed plus some changes	2013-03-14 17:55:33 +08:00
helpers	fixed checkout and start in personal plugin	2013-03-14 17:43:29 +08:00
mailers	Plugins	2012-09-14 00:05:31 +08:00
models	fixed author sample data generation and model method	2013-03-11 14:53:21 +08:00
views	Merge branch 'desktop_work' into desktop	2013-03-14 19:00:06 +08:00