Merge pull request #2 from hennevogel/master

Last stuff from the live instance
This commit is contained in:
Henne Vogelsang 2013-05-15 06:22:51 -07:00
commit b0c76b6204
2 changed files with 6 additions and 1 deletions

5
.gitignore vendored
View file

@ -1,3 +1,8 @@
config/application.rb
config/config.yml
config/database.yml
/vendor/cache
/vendor/cache-old
/storage/*
.idea/*
*.iml

View file

@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '3.2.9'
gem 'rails', '3.2.11'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'