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

Browse Source

...

This commit is contained in:

yflory

2017-07-17 18:08:07 +02:00

parent 009d01abde 0cd94e2ba8

commit 73e32f273e

16 changed files with 57 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

www/common/media-tag.js

File diff suppressed because one or more lines are too long