fixed conflict route and request bill

2017-06-07 22:21:42 +06:30
parent 234ef9bc15 b395e2e6f1
commit f9c8dbc03e
50 changed files with 731 additions and 379 deletions
--- a/2
+++ b/2
@@ -13,8 +13,8 @@ gem 'rails', '~> 5.1.0'
 #gem 'mysql2', '>= 0.3.18', '< 0.5'

 #Use PosgreSQL
+#gem 'pg'

- gem 'pg'
 # redis server for cable
 # gem 'redis', '~> 3.0'