Nweni eaec6a39b4 fixed conflict

2017-06-06 09:47:33 +06:30

..

api

fixed conflict

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

concerns

…

crm

update query data for origami

2017-06-06 09:18:01 +06:30

oqs

fixed for pm key changed

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

origami

fixed conflict

2017-06-06 09:47:33 +06:30

settings

Delete Fix for parent child process in Menu

2017-06-05 18:31:56 +06:30

transactions

origin pull master

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

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

…

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

…

install_controller.rb

…

print_settings_controller.rb

origin pull master

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