aboutsummaryrefslogtreecommitdiff
path: root/config_defaults.rb
diff options
context:
space:
mode:
authorBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2011-04-20 09:04:28 +0200
committerBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2011-04-20 09:04:28 +0200
commit930581ac3e526025989f45d713eaf3b0c07ba91b (patch)
treea8bc9608a5fe69d292a27d804bee9de9c03d3610 /config_defaults.rb
parente68db44b6e42de75f2fd243ea82e5f0151d49214 (diff)
bugfix for config (was not loaded in polls)
Diffstat (limited to 'config_defaults.rb')
-rw-r--r--config_defaults.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config_defaults.rb b/config_defaults.rb
index 18ccded..650d74e 100644
--- a/config_defaults.rb
+++ b/config_defaults.rb
@@ -70,7 +70,7 @@ $conf.aboutnotice = ""
$conf.default_css = "default.css"
-if File.exists?("config.rb")
+if File.exists?("config.rb") || File.exists?("../config.rb")
require "config"
end