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

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

..

app-poll.less

Initial work on the 'pad will expire' logic

2017-12-05 17:48:30 +01:00

index.html

Sandboxed Poll app with less2

2017-09-27 18:52:04 +02:00

inner.html

Improve stability and UI in poll and its comments

2017-10-05 17:54:07 +02:00

inner.js

Add the markdown toolbar to the slide and poll apps

2017-11-27 17:55:20 +01:00

main.js

Remove jquery from outer

2017-12-01 16:05:23 +01:00

render.js

resolve merge conflicts

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