diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 17:29:46 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 17:29:46 +0200 |
| commit | 777dd4b51e83a32cc252e1c87e1d0632d27c87b5 (patch) | |
| tree | f388dbdf617849fdca6848272a8ccff7bfe9a892 /src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java | |
| parent | b0710cdf040bae21828d913ef71af59165609f5b (diff) | |
| parent | bbfd98b726d732d1b9d2670247fbef51ba379866 (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java')
0 files changed, 0 insertions, 0 deletions