Aung Myo 406172c6ff fixed conflict

2017-06-09 12:04:36 +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

…

customers_controller.rb

queue and crm view updated

2017-06-09 09:29:25 +06:30

discounts_controller.rb

…

invoices_controller.rb

…

memberships_controller.rb

Add membership action

2017-06-09 02:23:16 +06:30

move_controller.rb

…

orders_controller.rb

…

payments_controller.rb

…

sale_items_controller.rb

…