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

2017-08-21 17:40:44 +06:30
parent e9ba56826c 9d424df9fd
commit e3c1dd216a
224 changed files with 5530 additions and 933 deletions
--- a/3
+++ b/3
@@ -37,6 +37,9 @@ gem 'tether-rails'
 gem "font-awesome-rails"
 gem 'rack-cors'

+# image upload
+gem 'carrierwave', '~> 1.0'
+
 #Report and Printing gems
 gem 'cups', '~> 0.0.7'
 gem 'prawn'