developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/vendor/built_in_modules/personal_conference
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
..
app Merge branch 'desktop_work_devin' into desktop 2013-03-05 18:48:12 +08:00
config using refine tiny scroll bar js for personal plugin 2013-03-04 16:35:09 +08:00
db done conferece seeds 2013-02-26 15:52:42 +08:00
lib relpace seminar to conference 2013-02-04 18:01:38 +08:00
script relpace seminar to conference 2013-02-04 18:01:38 +08:00
spec/factories make a fake data for personal conference plugin 2013-02-21 13:53:50 +08:00
.gitignore relpace seminar to conference 2013-02-04 18:01:38 +08:00
Gemfile relpace seminar to conference 2013-02-04 18:01:38 +08:00
MIT-LICENSE relpace seminar to conference 2013-02-04 18:01:38 +08:00
README.rdoc relpace seminar to conference 2013-02-04 18:01:38 +08:00
Rakefile relpace seminar to conference 2013-02-04 18:01:38 +08:00
init.rb member plugin init add frontend 2013-02-22 18:21:11 +08:00
personal_conference.gemspec relpace seminar to conference 2013-02-04 18:01:38 +08:00
personal_conference.json relpace seminar to conference 2013-02-04 18:01:38 +08:00

README.rdoc 

= PersonalSeminar

This project rocks and uses MIT-LICENSE.