devin c8aa50ee87 Lots of Update ... 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb		2013-04-17 14:14:23 +08:00
..
assets	Lots of Update	2013-04-17 14:14:23 +08:00
controllers	app manager changed plus some changes	2013-04-17 11:09:56 +08:00
helpers	fixed checkout and start in personal plugin	2013-04-17 11:08:58 +08:00
mailers	Plugins	2012-09-14 00:05:31 +08:00
models	correct model method	2013-04-17 11:13:32 +08:00
views	Lots of Update	2013-04-17 14:14:23 +08:00