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

Browse source

...

This commit is contained in:

Daniel Gultsch 2016-01-11 14:28:15 +01:00

parent 4d38ba906f 41afd552e9

commit 07a5ccf4d7

1 changed files with 33 additions and 19 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files

52

art/conversations_baloon.svg

View file

File diff suppressed because one or more lines are too long

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 40 KiB