diff options
| author | James Booth <boothj5@gmail.com> | 2014-10-02 22:17:56 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-10-02 22:17:56 +0100 |
| commit | ba6aded2b4e2a827fbd036aef61019c54eb503da (patch) | |
| tree | 0caa696d0012659b95d61af6cb0480aa71eb66fb /src/xmpp/connection.h | |
| parent | 3e6048582e3672dfb416f905cb0a9cce94127091 (diff) | |
| parent | 1423ee7a75a494e57dded274296bec11e58eeb92 (diff) | |
| download | profani-tty-ba6aded2b4e2a827fbd036aef61019c54eb503da.tar.gz | |
Merge branch 'master' into muc_roles
Diffstat (limited to 'src/xmpp/connection.h')
0 files changed, 0 insertions, 0 deletions