diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-02-23 13:10:33 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-02-23 13:10:33 +0100 |
| commit | 37e9db32998f640cad53523af07395de960cdc2f (patch) | |
| tree | 15a8a065af55f4d5a09b63a142d4a8d0e33dc754 /src/main/java/eu/siacs/conversations | |
| parent | 7a62fbbeae99e3ee3b5a2516e8f08e3a2c37c718 (diff) | |
| parent | b8e21e57ee8f8c450d35d2a592a71020e12d051c (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions