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
..
assets	modularize conference	2013-02-04 18:01:42 +08:00
controllers	using refine tiny scroll bar js for personal plugin	2013-03-04 16:35:09 +08:00
helpers	using refine tiny scroll bar js for personal plugin	2013-03-04 16:35:09 +08:00
mailers	relpace seminar to conference	2013-02-04 18:01:38 +08:00
models	authors auto-complete	2013-03-04 12:16:46 +08:00
views	Merge branch 'desktop_work' into desktop_work_devin	2013-03-05 18:35:17 +08:00