diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-31 19:21:39 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-31 19:21:39 +0200 |
| commit | 5b451b2703621747391f8915bfdb33a58a3f76c1 (patch) | |
| tree | 125b477ca8a0d727d0c2ab6d97502e05ec00c38a /src/main/java/eu/siacs/conversations/entities/Roster.java | |
| parent | 2cdc31a6887f242dfe4faca91af63ffd4e74ef67 (diff) | |
| parent | 848878b2a84efe884908ae56032b35e6e2fcd0a4 (diff) | |
Merge branch 'refs/heads/old_version' into new_version
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Roster.java')
0 files changed, 0 insertions, 0 deletions