Merge remote-tracking branch 'origin/master'
dummy commit to make heroku recompile assets
dummy commit to make heroku recompile assets
bump gems
bump gems
bump gems
add heroku keepalive
resolving conflicts
resolving conflicts
added precompiled assets
fiddle with config
added config
add new relic
add new_relic to production group
lets see
lets see