Yan 6d0cfd17ac merge with origin master

2017-06-18 12:50:07 +06:30

..

_form.html.erb

merge with origin master

2017-06-18 12:50:07 +06:30

_settings_order_queue_station.json.jbuilder

…

edit.html.erb

…

index.html.erb

…

index.json.jbuilder

…

new.html.erb

…

show.html.erb

…

show.json.jbuilder

…