merged with crm

2017-06-08 19:04:48 +06:30
parent 1cbbe9d672 ea4f50e779
commit 43debf4b7e
12 changed files with 163 additions and 98 deletions
--- a/4
+++ b/4
@@ -57,7 +57,11 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'sidekiq'

 # Pagination
+<<<<<<< HEAD
 gem 'kaminari', '~> 0.16.3' #:git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
+=======
+gem 'kaminari', '~> 0.16.3'
+>>>>>>> ea4f50e77942a7ccaa988af4dedd8cb4665b59c7

 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development