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

This commit is contained in:
Yan
2017-06-14 14:13:45 +06:30
3 changed files with 23 additions and 4 deletions

View File

@@ -42,7 +42,7 @@ gem 'to_xls-rails'
#Reporting gem
#gem 'compendium'
#gem "cancan"
# Use jquery as the JavaScript library
gem 'jquery-rails'
gem 'jquery-ui-rails'