diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 16:06:38 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 16:06:38 -0700 |
| commit | 19260b63080435af8362de3a98e10769f6c5267c (patch) | |
| tree | 980d33c1b2b6195cab12977a22b5b1bbb1e19005 /lib | |
| parent | 12ed72c5ee9597cf771e22af5c090e48e7c0a1e5 (diff) | |
| parent | f8ee42cf1e01d3f89ff8ee324ea423b6239ca2a3 (diff) | |
Merge branch 'release/0.8' into develop
Conflicts:
locale/he_IL/app.po
locale/id/app.po
Diffstat (limited to 'lib')
| -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 f155ed7a4..fca48782e 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -6,6 +6,7 @@ module Configuration DEFAULTS = { :ADMIN_PASSWORD => '', :ADMIN_USERNAME => '', + :DISABLE_EMERGENCY_USER => false, :AVAILABLE_LOCALES => '', :BLACKHOLE_PREFIX => 'do-not-reply-to-this-address', :BLOG_FEED => '', |