Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ... Conflicts: app/helpers/attribute_fields_helper.rb app/views/admin/infos/_form.html.erb config/locales/zh_tw.yml		2012-11-16 15:42:39 +08:00
..
_attribute_field.html.erb	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00
edit.html.erb	address field and text field convert	2012-11-15 17:23:39 +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