diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-06 16:44:40 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-06 16:44:40 +0200 |
| commit | 5cd750cb5e7ce5e9b0ddcab8e0089b964d1de70d (patch) | |
| tree | ebbec8a6d42bb769f2b5e717a47a05aa7fbfaf6d /src/eu/siacs/conversations/services | |
| parent | a1507d91ffc8e0edcdb4fae7a95d746c0091622e (diff) | |
| parent | c489f368b861bdee5e438301e1cc6b6e8c067e54 (diff) | |
Merge branch 'kruks23-development' into development
Diffstat (limited to 'src/eu/siacs/conversations/services')
0 files changed, 0 insertions, 0 deletions