Nweni 0cc378f318 fixed conflict

2017-06-06 09:43:16 +06:30

..

restaurant

…

api_controller.rb

…

authenticate_controller.rb

…

bill_controller.rb

added new image upload file

2017-06-05 17:14:07 +06:30

bookings_controller.rb

update booking controller in crm

2017-06-02 13:17:09 +06:30

customers_controller.rb

…

discounts_controller.rb

…

invoices_controller.rb

…

memberships_controller.rb

…

move_controller.rb

…

orders_controller.rb

updated migration code

2017-06-05 15:06:34 +06:30

payments_controller.rb

…

sale_items_controller.rb

…