diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-03 00:07:41 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-03 00:07:41 +0100 |
| commit | 53aaaf68d538677493669e9d623ab4057c254903 (patch) | |
| tree | c7851914dc716a049c31efd3bf74dfc7c750c7f7 /src/main/java/eu/siacs | |
| parent | eb0f8c08bdc17e4246ef7a22f321f3a1a87b2e4b (diff) | |
| parent | 59402da60d9d99f17a9635364945c79014385e37 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions