orbit-basic/vendor/built_in_modules/personal_journal
Lukas adc15951bb questionnaire stuff
Conflicts:

	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
..
app Changes for queries 2013-05-03 12:12:19 +08:00
config Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
db correct model method 2013-04-17 14:07:24 +08:00
lib Plugins 2012-09-14 00:05:31 +08:00
script Plugins 2012-09-14 00:05:31 +08:00
spec/factories remove redundant space of co_author sample data 2013-04-17 11:04:52 +08:00
.gitignore Plugins 2012-09-14 00:05:31 +08:00
Gemfile Plugins 2012-09-14 00:05:31 +08:00
MIT-LICENSE Plugins 2012-09-14 00:05:31 +08:00
README.rdoc Plugins 2012-09-14 00:05:31 +08:00
Rakefile Plugins 2012-09-14 00:05:31 +08:00
init.rb member plugin init add frontend 2013-02-22 18:21:11 +08:00
personal_journal.gemspec Plugins 2012-09-14 00:05:31 +08:00
personal_journal.json Plugins 2012-09-14 00:05:31 +08:00

README.rdoc

= PersonalJournal

This project rocks and uses MIT-LICENSE.