summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/home/index.html.haml2
-rw-r--r--config/defaults.yml1
2 files changed, 1 insertions, 2 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 5e33e62..147cacd 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -6,4 +6,4 @@
#push
-# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
#footer
- = render 'layouts/footer'
+ = render 'layouts/footer' \ No newline at end of file
diff --git a/config/defaults.yml b/config/defaults.yml
index bcb8dac..7e2ea58 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -32,7 +32,6 @@ common: &common
pagination_size: 30
auth:
token_expires_after: 60
-
# handles that will be blocked from being used as logins or email aliases
# in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
handle_blacklist: