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

Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into crm

Browse Source
This commit is contained in:
Aung Myo
2017-06-04 16:15:02 +06:30
parent 9b334a20fa 89cbb59e7c
commit 3679fe10b8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@@ -9,6 +9,10 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.0' gem 'rails', '~> 5.1.0'
# Use mysql as the database for Active Record # Use mysql as the database for Active Record
<<<<<<< HEAD
#gem 'mysql2', '>= 0.3.18', '< 0.5'
gem 'pg'
=======
gem 'mysql2', '>= 0.3.18', '< 0.5' gem 'mysql2', '>= 0.3.18', '< 0.5'
#Use PosgreSQL #Use PosgreSQL
@@ -17,6 +21,7 @@ gem 'pg'
# redis server for cable # redis server for cable
# gem 'redis', '~> 3.0' # gem 'redis', '~> 3.0'
>>>>>>> a2c9996b765666db4cbcbef188fcfa2d27a7a6e2
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 3.0' gem 'puma', '~> 3.0'
# Use SCSS for stylesheets # Use SCSS for stylesheets