Orbit/app/assets/images/desktop
devin a62ff9308f 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-03-29 12:03:15 +08:00
..
select2 Lots of Update 2013-03-29 12:03:15 +08:00
chrome.png add browser compatibility page 2013-03-21 18:25:36 +08:00
compatibility_bg.jpg add browser compatibility page 2013-03-21 18:25:36 +08:00
firefox.png add browser compatibility page 2013-03-21 18:25:36 +08:00
ie.png add browser compatibility page 2013-03-21 18:25:36 +08:00
opera.png add browser compatibility page 2013-03-21 18:25:36 +08:00
safari.png add browser compatibility page 2013-03-21 18:25:36 +08:00