phyusin 98334531b2 remove conflict text

2017-10-25 16:53:22 +06:30

..

_form.html.erb

add right panel text

2017-10-25 16:41:58 +06:30

_settings_menu_item.json.jbuilder

UI change

2017-10-23 11:38:10 +06:30

edit.html.erb

UI change

2017-10-23 11:38:10 +06:30

index.html.erb

update setting admin pages

2017-10-24 18:16:03 +06:30

index.json.jbuilder

UI change

2017-10-23 11:38:10 +06:30

new.html.erb

UI change

2017-10-23 11:38:10 +06:30

show.html.erb

remove conflict text

2017-10-25 16:53:22 +06:30

show.json.jbuilder

UI change

2017-10-23 11:38:10 +06:30