Caleb James DeLisle 0d1f19f5d4 Big manual merge

2017-08-04 11:20:17 +02:00

..

less

Big manual merge

2017-08-04 11:20:17 +02:00

less2

Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page

2017-08-04 12:16:33 +03:00

template.html

fix lowercased p

2017-07-06 10:49:33 +02:00