a9bf400fac
* 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 |
||
|---|---|---|
| .. | ||
| appstore | ||
| books | ||
| patents | ||
| research_domain | ||
| research_project | ||
| settings | ||
| allsections.html.erb | ||
| app_manager.html.erb | ||
| app_view1.html.erb | ||
| appstore.html.erb | ||
| books.html.erb | ||
| desktop.html.erb | ||
| index.html.erb | ||
| orbit.html.erb | ||
| research_d.html.erb | ||
| research_p.html.erb | ||
| settings.html.erb | ||