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

pull/1/head
yflory 8 years ago
commit 24c14ffbf3

@ -117,7 +117,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>

@ -114,7 +114,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>

@ -236,7 +236,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>

@ -135,7 +135,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>

@ -39,5 +39,5 @@
</div>
</div>
</div>
<div class="version-footer">CryptPad v1.8.0 (Igopogo)</div>
<div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
</footer>

@ -118,7 +118,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,7 +1,7 @@
{
"name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server",
"version": "1.8.0",
"version": "1.9.0",
"dependencies": {
"chainpad-server": "^1.0.1",
"express": "~4.10.1",

@ -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>

@ -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>

Loading…
Cancel
Save