diff options
| -rw-r--r-- | app/views/home/index.html.haml | 2 | ||||
| -rw-r--r-- | config/defaults.yml | 1 | ||||
| -rw-r--r-- | doc/TWITTER_FEED.md | 2 |
3 files changed, 2 insertions, 3 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: diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md index 218bc26..dd3954c 100644 --- a/doc/TWITTER_FEED.md +++ b/doc/TWITTER_FEED.md @@ -32,4 +32,4 @@ LEAP web app (as part of the main view). ### Default avatar image ### -This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/. +This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow the Twitter Trademark Guidelines as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/. |