diff options
| author | Michael <betheg@bitcloner.org> | 2014-08-29 23:30:47 +0200 |
|---|---|---|
| committer | Michael <betheg@bitcloner.org> | 2014-08-29 23:30:47 +0200 |
| commit | 3714947d5f9307b173fdaf7b0fc08d92fd824553 (patch) | |
| tree | 1257249aa0b0d017170bce7c9349f48cbe68af05 /src/eu/siacs/conversations/xmpp | |
| parent | 98dabe9ab488ab92ff255cb04feaaddad6488c12 (diff) | |
| parent | 5450a2ae469a84f5c285aeaf68135684ad6aae27 (diff) | |
Merge remote-tracking branch 'upstream/development' into fix_typo
Diffstat (limited to 'src/eu/siacs/conversations/xmpp')
0 files changed, 0 insertions, 0 deletions