Merge branch 'master' of github.com:Connoropolous/metamaps_gen002

This commit is contained in:
Devin Howard 2012-12-09 19:47:28 -05:00
commit fcf6c87d2f

2
.gitignore vendored
View file

@ -4,7 +4,7 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global
/config/database.yml
config/database.yml
# Ignore bundler config
/.bundle