diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-04-20 20:33:04 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-04-20 20:33:04 +0200 |
commit | cfc4fbaa101fa95e710f695af5e9e11a5e8c8f41 (patch) | |
tree | 255241a8b8c8d98b3553f2fe6aa6f6a0108cf956 /src/main/java/eu/siacs/conversations/entities/AbstractEntity.java | |
parent | e7972d3d112065f37b1b4d99584ecc8f1ca8fd32 (diff) | |
parent | 69b43556525a3a2a1565dbbe3289399d51cc642f (diff) |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/AbstractEntity.java')
0 files changed, 0 insertions, 0 deletions