Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 4 years ago
commit a3ca63d77c

@ -1,7 +1,7 @@
@font-face { @font-face {
font-family: 'cptools'; font-family: 'cptools';
src: src: url('fonts/cptools.eot?chd5a1');
url('fonts/cptools.ttf?am461j') format('truetype'), src: url('fonts/cptools.eot?chd5a1#iefix') format('embedded-opentype'),
url('fonts/cptools.ttf?chd5a1') format('truetype'), url('fonts/cptools.ttf?chd5a1') format('truetype'),
url('fonts/cptools.woff?chd5a1') format('woff'), url('fonts/cptools.woff?chd5a1') format('woff'),
url('fonts/cptools.svg?chd5a1#cptools') format('svg'); url('fonts/cptools.svg?chd5a1#cptools') format('svg');

Loading…
Cancel
Save