Merge branch 'footer-links' of git://github.com/james-geiger/BookStack into james...

diff --cc resources/lang/en/settings.php
Simple merge

diff --cc resources/sass/_html.scss
index 57869d6520b04aa6a90ea5405c36d8a95de0927f,e123ee286d5a0f4a4b06428585787417db251d2a..0262956691a0f4fc978b72f6ac6d56a25637cf15
--- 1/resources/sass/_html.scss
--- 2/resources/sass/_html.scss
+++ b/resources/sass/_html.scss
@@@ -23,6 -20,10 +23,10 @@@ html 
  body {
    font-size: $fs-m;
    line-height: 1.6;
 -  color: #444;
 +  @include lightDark(color, #444, #AAA);
    -webkit-font-smoothing: antialiased;
- }
+   background-color: #F2F2F2;
+   height: 100%;
+   display: flex;
+   flex-direction: column;
 -}
++}

diff --cc resources/sass/_layout.scss
Simple merge

diff --cc resources/sass/styles.scss
Simple merge

diff --cc resources/views/base.blade.php
Simple merge

diff --cc resources/views/settings/index.blade.php
Simple merge