merge with master

This commit is contained in:
Yan
2017-06-02 16:52:58 +06:30
parent 7e46e3c634
commit 6d705e2860
8 changed files with 44 additions and 1 deletions

View File

@@ -99,6 +99,8 @@ Rails.application.routes.draw do
root "home#index"
post 'update_delivery', to: "home#update_delivery_status"
get 'print/print'
#dashboard
#
end