Nweni b1ff773ac7 fixed conflict/

2019-11-15 13:54:28 +06:30

..

action_controller.rb

gem

2019-11-15 13:53:31 +06:30

application_controller_renderer.rb

…

assets.rb

acces level for transaction/sale VOID

2018-09-24 15:43:28 +06:30

backtrace_silencers.rb

…

carrier_wave.rb

…

cookies_serializer.rb

…

filter_parameter_logging.rb

…

inflections.rb

…

kaminari_config.rb

…

license.rb

cap deployment setup

2019-10-25 12:29:56 +06:30

mime_types.rb

update menu import and export

2018-03-19 18:13:38 +06:30

mysql2_adapter.rb

add pool zine in adapter

2018-04-25 14:15:04 +06:30

new_framework_defaults.rb

…

ranged_datetime_wrapper.rb

…

secrets.rb

…

session_store.rb

…

sidekiq.rb

redis and sidekiq config

2018-01-18 11:34:32 +06:30

simple_form_bootstrap.rb

…

simple_form.rb

…

wrap_parameters.rb

…