merge changes from soon

This commit is contained in:
ansuz committed 2016-11-03 16:05:02 +01:00
commit 8064b1d196
19 files changed
+964 -367

No files matched your search

-4
View File
@@ -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>