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	add_more ok	2012-11-08 18:59:19 +08:00
_form.html.erb	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-11-16 15:42:39 +08:00
_list_block.html.erb	add new member with role interface. add more not usable.	2012-11-04 20:42:58 +08:00
_placeholder_block.html.erb	add new member with role interface. add more not usable.	2012-11-04 20:42:58 +08:00
add_attribute_field.js.erb	add new member with role interface. add more not usable.	2012-11-04 20:42:58 +08:00