Spen 6c514770bc solved conflict for member_new_ui		2013-08-12 15:40:34 +08:00
..
_attribute_field.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
_sub_role_attribute.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
_sub_role_index.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
add_attribute_field.js.erb	member roles edit	2013-01-14 17:02:51 +08:00
add_sub_role.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
destroy.js.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
edit.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
edit_sub_role.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
new.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
role_field.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
sub_role.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
sub_role.js.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
sub_role_field.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
toggle_enable.js.erb	member roles edit	2013-01-14 17:02:51 +08:00