diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 20:16:35 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 20:16:35 +0100 |
| commit | dd8dac73d2564075f662df03892228a887fa1099 (patch) | |
| tree | dde1a3d30377805f0d7c1d01b6b24f28c4feffdf /src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java | |
| parent | 1d9a840c0bd84804840ffd03a595c70b880b6d1d (diff) | |
| parent | 00fc37b326c3255af2f1592dde909b21e112f46f (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java')
0 files changed, 0 insertions, 0 deletions