Yan 6d0cfd17ac merge with origin master

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

..

restaurant

…

api_controller.rb

…

authenticate_controller.rb

…

bill_controller.rb

merge with origin master

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

bookings_controller.rb

…

customers_controller.rb

…

discounts_controller.rb

…

invoices_controller.rb

update

2017-06-14 16:06:11 +06:30

memberships_controller.rb

update

2017-06-14 16:06:11 +06:30

move_controller.rb

…

orders_controller.rb

update order for oqs

2017-06-16 19:26:21 +06:30

payments_controller.rb

update

2017-06-14 16:06:11 +06:30

sale_items_controller.rb

…