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

conflict file

Browse Source
This commit is contained in:
Aung Myo
2017-06-06 14:49:25 +06:30
parent e76296bb77 d2ce74f648
commit 8fd23bfd87
10 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@@ -13,7 +13,6 @@ gem 'rails', '~> 5.1.0'
gem 'mysql2', '>= 0.3.18', '< 0.5'
#Use PosgreSQL
gem 'pg'
# redis server for cable
# gem 'redis', '~> 3.0'
@@ -92,4 +91,6 @@ end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'httparty', '~> 0.15.5'
gem 'httparty', '~> 0.15.5'
gem 'bootstrap-datepicker-rails'