glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge d925e89d00 into 6767771d7d

Browse source
This commit is contained in:
mix irving 2015-08-05 15:47:07 +00:00
commit 526fc6064c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -9,7 +9,7 @@ gem 'rails', '3.2.17'
gem 'devise' gem 'devise'
gem 'redis' gem 'redis'
gem 'pg' gem 'pg'
gem 'cancan' gem 'cancancan'
gem 'formula' gem 'formula'
gem 'formtastic' gem 'formtastic'
gem 'json' gem 'json'

4
Gemfile.lock
View file

@ -40,7 +40,7 @@ GEM
jquery-rails jquery-rails
rails (~> 3.1) rails (~> 3.1)
builder (3.0.4) builder (3.0.4)
cancan (1.6.10) cancancan (1.10.1)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
cocaine (0.5.4) cocaine (0.5.4)
@ -162,7 +162,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
aws-sdk aws-sdk
best_in_place best_in_place
cancan cancancan
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
devise devise
formtastic formtastic