diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-10-11 14:27:41 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-10-11 14:27:41 +0200 |
commit | 540f6510de41ed3ff899ad4cfe2ab157a2316edf (patch) | |
tree | 00e16f62f936aa18d91bd2cd790e225683ba520b /src/main/java/eu/siacs | |
parent | 9e1393bc1c8903d400e559b3528a0fe5d04bd389 (diff) | |
parent | ca1fe61f09107d19d0fee07c9234739cfd8e4344 (diff) |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions