ansuz c390bdd518 resolve merge conflicts		2017-07-26 12:41:13 +02:00
..
example	resolve merge	2017-07-23 14:31:13 +02:00
index.html	oups	2017-07-23 14:32:13 +02:00
inner.html	slightly better styles	2017-07-24 16:14:49 +02:00
inner.js	pull in bootstrap. submit form on enter	2017-07-24 16:22:12 +02:00
main.js	resolve merge conflicts	2017-07-26 12:41:13 +02:00
todo.js	Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo	2017-07-24 16:23:59 +03:00
todo.less	fix styles for very wide todos	2017-07-26 11:06:17 +02:00