fixed conflict after merge with dev branch for report query updated

2019-11-27 14:09:16 +06:30
parent 98b74af6cf 47c12c6faa
commit a0b7557f06
75 changed files with 1509 additions and 1940 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -375,5 +375,8 @@ DEPENDENCIES
  web-console (>= 3.3.0)
  whenever

+RUBY VERSION
+   ruby 2.4.1p111
+   
 BUNDLED WITH
   2.0.2