orbit-basic/vendor
Rueshyna 74900ac048 Merge branch 'desktop_work' into desktop_work_devin
* desktop_work:
  tinyscrollbar minor update
  desktop CSS update

Conflicts:
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 18:35:17 +08:00
..
built_in_modules Merge branch 'desktop_work' into desktop_work_devin 2013-03-05 18:35:17 +08:00
plugins New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00