Merge branch 'master' into osx-functional

Browse Source

...

This commit is contained in:

James Booth 2016-08-13 00:17:00 +01:00

parent 71f043a32f 4f5281bff0

commit 0530b7cc52

1 changed files with 391 additions and 410 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

801

src/xmpp/stanza.c

File diff suppressed because it is too large Load Diff