diff options
author | Vitaly Takmazov | 2016-02-01 17:11:49 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2016-02-01 17:11:49 +0300 |
commit | cdfb7ce31855c0c27c6672f9dc36b1e8a0941ac0 (patch) | |
tree | 993f727765edce333a272f33bdb27244305834f3 /src/main/java/com/juick/xmpp/s2s/Connection.java | |
parent | 474323453f1b881273f618555845e07ace830bd2 (diff) | |
parent | c8076938933dfc9fda8dd300af5d5bf24a8fa555 (diff) |
Merge remote-tracking branch 'bitbucket/develop' into develop
Diffstat (limited to 'src/main/java/com/juick/xmpp/s2s/Connection.java')
0 files changed, 0 insertions, 0 deletions