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/BottomBar.html
+++ b/customize.dist/BottomBar.html
@@ -12,10 +12,6 @@
      <p data-localization="bottom_france">
      </p>
   </div>
-    <!--
-    <div class="bottom-bar-center">
-      <p><a href="https://github.com/xwiki-labs/cryptpad">Fork me on GitHub</a></p>
-    </div> -->
    <div class="bottom-bar-right">
      <p data-localization="bottom_support">
      </p>