aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-10-04 12:37:53 +0100
committerLouise Crow <louise.crow@gmail.com>2012-10-04 12:37:53 +0100
commit33cf36a3dfafe64bd721e0627e2a99b56a94238c (patch)
treead203ab96bdaa537ec44b6874b359aad4adcdc08 /lib
parentb6231086aa895c83bfeb1cc7067725a9b96e8d0d (diff)
parent772af44350723936778abe45e888b2fac36da726 (diff)
Merge remote-tracking branch 'henare_github/full-url-in-admin-emails' into develop
Diffstat (limited to 'lib')
-rw-r--r--lib/configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb
index e52f6e956..5f761a1f6 100644
--- a/lib/configuration.rb
+++ b/lib/configuration.rb
@@ -4,7 +4,7 @@
module Configuration
DEFAULTS = {
- :ADMIN_BASE_URL => '/admin/',
+ :ADMIN_BASE_URL => '',
:ADMIN_PASSWORD => '',
:ADMIN_PUBLIC_URL => '',
:ADMIN_USERNAME => '',