Merge branch 'master' of github.com:TracksApp/tracks

This commit is contained in:
Reinier Balt 2014-05-16 16:36:18 +02:00
commit 782d94bdc9
2 changed files with 2 additions and 2 deletions

View file

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~>4.1' gem 'rails', '~>4.1.0'
gem 'sass-rails', '~>4.0' gem 'sass-rails', '~>4.0'
gem 'coffee-rails', '~>4.0' gem 'coffee-rails', '~>4.0'

View file

@ -228,7 +228,7 @@ DEPENDENCIES
mocha mocha
mysql2 mysql2
rack-mini-profiler rack-mini-profiler
rails (~> 4.1) rails (~> 4.1.0)
rails_autolink rails_autolink
rspec-expectations rspec-expectations
sanitize sanitize