diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-05-22 19:42:43 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-05-22 19:42:43 +0200 |
commit | ca34be385e8c1e414dab4b49080087dffa85f876 (patch) | |
tree | 97a0ceeeca0b2512919492317db8412becbef8fa /src/main/java/eu/siacs/conversations/services/EventReceiver.java | |
parent | 73a02abfd73da1ca5f5f9ed6c0c7c287371d0d25 (diff) | |
parent | abbdf232c6f27a00edaa9af5937f9d022ad15f65 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/EventReceiver.java')
0 files changed, 0 insertions, 0 deletions