diff options
| author | luca-marie <ml.kochsiek@fu-berlin.de> | 2016-09-13 15:47:09 +0200 |
|---|---|---|
| committer | luca-marie <ml.kochsiek@fu-berlin.de> | 2016-09-13 15:47:09 +0200 |
| commit | 473fc07bb6255949c108cddb3ef81e6c1d8fbfce (patch) | |
| tree | 20dce729cc23e278abd09683abe72c208b320365 | |
| parent | b66eb2b7af58cd4354f0c5262a7061e3d20e317c (diff) | |
| parent | 06c4cd96bce54ca1756e361ce901050214992a41 (diff) | |
Merge branch 'develop' of github.com:LoadToCode/leap_web into develop
| -rw-r--r-- | app/views/home/index.html.haml | 2 | ||||
| -rw-r--r-- | config/defaults.yml | 1 |
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: |