Caleb James DeLisle ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-12-05 18:32:29 +01:00

..

app-filepicker.less

Overrides to colortheme.less will nolonger block the adding of new keys to the original file

2017-12-05 18:32:23 +01:00

index.html

Enable drag & upload in code2 and prepare filepicker

2017-08-31 16:32:26 +02:00

inner.html

Base for Drive in sandboxed iframe

2017-09-21 17:59:26 +02:00

inner.js

resolve merge conflicts

2017-11-23 16:56:49 +01:00

main.js

Use async store

2017-11-30 15:01:17 +01:00