Nweni 0cc378f318 fixed conflict

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

..

api

fixed conflict

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

concerns

user role scoped layout and controller

2017-04-20 22:29:39 +06:30

crm

missing bookings controller adding

2017-06-02 14:52:14 +06:30

oqs

fixed for pm key changed

2017-06-05 18:52:19 +06:30

origami

added new image upload file

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

settings

comment the conflict in creating menu item instances with account and item attribute validate

2017-06-05 10:00:32 +06:30

transactions

origin pull master

2017-06-03 13:44:10 +06:30

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

user role scoped layout and controller

2017-04-20 22:29:39 +06:30

base_oqs_controller.rb

frontend view layout

2017-04-21 05:07:00 +06:30

base_origami_controller.rb

frontend view layout

2017-04-21 05:07:00 +06:30

base_waiter_controller.rb

frontend view layout

2017-04-21 05:07:00 +06:30

home_controller.rb

user role scoped layout and controller

2017-04-20 22:29:39 +06:30

install_controller.rb

…

print_settings_controller.rb

origin pull master

2017-06-03 13:44:10 +06:30