phyusin bd06e80b37 remove conflict data

2018-03-05 16:24:45 +06:30

..

create.html.erb

UI change

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

dashboard_backup.html.erb

UI change

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

dashboard.html.erb

remove conflict data

2018-03-05 16:24:45 +06:30

destroy.html.erb

UI change

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

index_backup.html.erb

UI change

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

index-old.html.erb

UI change

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

index.html.erb

UI change

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

show.html.erb

UI change

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