diff options
author | Vitaly Takmazov | 2016-02-07 22:56:40 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2016-02-07 22:56:40 +0300 |
commit | fb999f130fc5592e924c39ca2e251cfa03575427 (patch) | |
tree | f475d5203c24dbc4d1091a59be83cf7479d9b545 /src/main/java/com/juick/xmpp/extensions | |
parent | 35ae74603abe9569554f31d426b54bfc8c680d42 (diff) | |
parent | ec0e62c6ce7233aaa7b77d619637a501ea11a2b1 (diff) |
Merge branch 'sans_branch' into develop
Diffstat (limited to 'src/main/java/com/juick/xmpp/extensions')
0 files changed, 0 insertions, 0 deletions