git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflit

Browse Source
This commit is contained in:
Zin Lin Phyo
2017-08-29 18:42:08 +06:30
parent f03d8654e7 e84c080552
commit 5fcfbdc020
16 changed files with 2965 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@@ -115,7 +115,10 @@ gem 'httparty', '~> 0.15.5'
gem 'momentjs-rails', :git => 'git://github.com/derekprior/momentjs-rails.git'
gem 'bootstrap-daterangepicker-rails'
# # gem 'momentjs-rails', '>= 2.9.0'
# gem 'bootstrap3-datetimepicker-rails'z
# gem 'bootstrap3-datetimepicker-rails'
# gem 'momentjs-rails', '>= 2.9.0'
# gem 'bootstrap3-datetimepicker-rails'
gem 'datetimepicker-rails', github: 'zpaulovics/datetimepicker-rails', branch: 'master', submodules: true
gem 'bootstrap-datepicker-rails'
gem 'jquery-datetimepicker-rails'
gem 'select2-rails'