diff options
author | Jonne Haß <me@mrzyx.de> | 2012-01-22 18:05:37 +0400 |
---|---|---|
committer | Jonne Haß <me@mrzyx.de> | 2012-01-22 18:05:37 +0400 |
commit | 7fd606ba192edcaa29205cbbfd6750db0b427e49 (patch) | |
tree | 076dbcbce7c46676ff04d8bf507548b775ff61bb /Gemfile | |
parent | 54cb3ea3cbaf6e9b4cf22f66d2afda72a019230d (diff) | |
parent | 5ce4f607369c1adda5b1cb3ee5b512baccc6dacd (diff) |
Merge branch '2688-airbreak' of https://github.com/fred/diaspora
Conflicts:
config/application.yml.example
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -28,7 +28,7 @@ gem 'messagebus_ruby_api', '1.0.1' group :production do # we don't install these on travis to speed up test runs # reporting - gem 'hoptoad_notifier' + gem 'airbrake' gem 'newrelic_rpm' gem 'rack-google-analytics', :require => 'rack/google-analytics' gem 'rack-piwik', :require => 'rack/piwik' |