merge changes from soon

2016-11-03 16:05:02 +01:00
parent ef17dd66fa 2d5448458b
commit 8064b1d196
19 changed files with 964 additions and 367 deletions
--- a/customize.dist/Header.html
+++ b/customize.dist/Header.html
@@ -17,6 +17,7 @@
    </div>
    <div class="bottom-bar-right">
      <p data-localization="header_xwiki" class="small">
+          <a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer"><img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>
      <p data-localization="header_support" class="big">
      </p>
    </div>