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
..
_attribute_field.html.erb	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00
edit.html.erb	add new member with role interface. add more not usable.	2012-11-04 20:42:58 +08:00
index.html.erb	Add missing translations	2012-09-24 09:02:46 +08:00
new.html.erb	Merge with sub_roles	2011-12-23 18:34:21 +08:00
toggle_enable.js.erb	Merge with sub_roles	2011-12-23 18:34:21 +08:00