Spen 6c514770bc solved conflict for member_new_ui		2013-08-12 15:40:34 +08:00
..
_attribute.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
_attribute_field.html.erb	Translation changes	2012-12-03 23:00:04 +08:00
_attribute_field_list.html.erb	member roles edit	2013-01-14 17:02:51 +08:00
_index.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
add_attribute_field.js.erb	add info field	2012-12-06 07:58:39 +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
index.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
index.js.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
toggle_enable.js.erb	Merge with sub_roles	2011-12-23 18:34:21 +08:00