summaryrefslogtreecommitdiff
path: root/app/views/home
diff options
context:
space:
mode:
authorMarie <ml.kochsiek@fu-berlin.de>2016-09-14 16:38:51 +0000
committerGitHub <noreply@github.com>2016-09-14 16:38:51 +0000
commitd72c87cb94213c9a507596f2103773969d1cbd30 (patch)
tree7b13646448e64e560101493eeac1a03c3a25dbd8 /app/views/home
parent42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 (diff)
parent22478d315af3590d2a344eb1aa8cf2aec0730506 (diff)
Merge pull request #14 from LoadToCode/develop
Taking it all from branch develop and push it to branch temp_1_marie
Diffstat (limited to 'app/views/home')
-rw-r--r--app/views/home/index.html.haml2
1 files changed, 1 insertions, 1 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