Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory committed 2017-06-15 16:31:09 +02:00
commit 24c14ffbf3
9 files changed
+9 -9

No files matched your search

+1 -1
View File
@@ -108,7 +108,7 @@
</div>
</div>
</div>
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
</footer>
</body>
+1 -1
View File
@@ -108,7 +108,7 @@
</div>
</div>
</div>
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
</footer>
</body>