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

..

devise.en.yml

add i18n variables

2012-10-26 11:19:56 +08:00

devise.zh_tw.yml

can add member

2012-10-26 11:19:56 +08:00

en.yml

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

rails.yml

Add asset model and controller

2010-02-01 17:24:28 +08:00

social_share_button.en.yml

first version of fb_share

2012-08-08 11:04:19 +08:00

social_share_button.zh-tw.yml

first version of fb_share

2012-08-08 11:04:19 +08:00

zh_tw.yml

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00