Rueshyna a9bf400fac Merge branch 'desktop_work_devin' into desktop ... * desktop_work_devin: tinyscrollbar minor update desktop CSS update tinyscrollbar minor update desktop CSS update Conflicts: app/views/desktop/index.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb 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/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb		2013-03-05 18:48:12 +08:00
..
panel/personal_conference	Merge branch 'desktop_work_devin' into desktop	2013-03-05 18:48:12 +08:00
.gitkeep	relpace seminar to conference	2013-02-04 18:01:38 +08:00