diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 11:13:38 -0700 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 11:13:38 -0700 |
commit | 411aee219e14fe3d942699f230f7a8e3ed70bfe0 (patch) | |
tree | cbd41460afc2f0e24d7490d3034eee2544f3bac5 /lib/configuration.rb | |
parent | 9ccc03bc7d4c4e9064a9217d6e332abfb3f15b7f (diff) | |
parent | 0d9de53bdccf20cc2884f0ad896d5e9dd2edee03 (diff) |
Merge branch 'release/0.12' into wdtk
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
spec/models/info_request_spec.rb
Diffstat (limited to 'lib/configuration.rb')
-rw-r--r-- | lib/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index 88890856b..03c4ac616 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -28,6 +28,7 @@ module AlaveteliConfiguration :DEFAULT_LOCALE => '', :DISABLE_EMERGENCY_USER => false, :DOMAIN => 'localhost:3000', + :DONATION_URL => '', :EXCEPTION_NOTIFICATIONS_FROM => '', :EXCEPTION_NOTIFICATIONS_TO => '', :FORCE_REGISTRATION_ON_NEW_REQUEST => false, |