Merge branch 'master' of github.com:siacs/Conversations

This commit is contained in:
Daniel Gultsch 2016-01-11 14:28:15 +01:00
commit 07a5ccf4d7
1 changed files with 33 additions and 19 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 40 KiB