pull master

This commit is contained in:
Yan
2017-06-01 12:11:23 +06:30
29 changed files with 727 additions and 18 deletions

View File

@@ -46,7 +46,6 @@ gem 'to_xls-rails'
# Pagination
gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks