developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/desktop
History
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
..
appstore desktop CSS update 2013-03-05 09:39:01 +08:00
books desktop CSS update 2013-03-05 09:39:01 +08:00
patents desktop CSS update 2013-03-05 09:39:01 +08:00
research_domain desktop CSS update 2013-03-05 09:39:01 +08:00
research_project desktop CSS update 2013-03-05 09:39:01 +08:00
settings merging 2013-03-05 11:20:01 +08:00
allsections.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
app_manager.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
app_view1.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
appstore.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
books.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
desktop.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
index.html.erb Merge branch 'desktop_work_devin' into desktop 2013-03-05 18:48:12 +08:00
orbit.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
research_d.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
research_p.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00
settings.html.erb desktop CSS update 2013-03-05 09:39:01 +08:00