Orbit/vendor/built_in_modules/personal_conference
devin a62ff9308f Lots of Update
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	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/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-03-29 12:03:15 +08:00
..
app Lots of Update 2013-03-29 12:03:15 +08:00
config Lots of Update 2013-03-29 12:03:15 +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 remove redundant space of co_author sample data 2013-03-21 18:24:20 +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.