Orbit/vendor/built_in_modules/personal_research
chris b40d4702d5 Merge branch 'master' into various_bugs
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
..
app Merge branch 'master' into various_bugs 2012-11-06 11:44:00 +08:00
config
lib
script
test demo site plugin 2012-09-24 14:10:44 +08:00
.gitignore
Gemfile
MIT-LICENSE
README.rdoc demo site plugin 2012-09-24 14:10:44 +08:00
Rakefile
init.rb
personal_research.gemspec
personal_research.json

README.rdoc

= PersonalResearch

This project rocks and uses MIT-LICENSE.