web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into newCk

Browse Source
This commit is contained in:
yflory
2017-06-20 10:57:40 +02:00
parent f13d23241c 728272d936
commit 5a248db267
59 changed files with 1651 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@@ -37,7 +37,6 @@
"diff-dom": "^2.1.1",
"alertifyjs": "^1.0.11",
"scrypt-async": "^1.2.0",
"bootstrap": "#v4.0.0-alpha.6",
"pdfjs-dist": "^1.8.398"
"bootstrap": "#v4.0.0-alpha.6"
}
}