diff options
author | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
commit | c18696c85d5801dfd39ffe494240b5f849deedb8 (patch) | |
tree | a51ac3bbfab1c656a3e00f8725d5e09b774f94c1 /src/main/java/eu/siacs/conversations/entities/AbstractEntity.java | |
parent | 024b2c80aa6da4adf2a48d89047a72bbb2bda5ad (diff) | |
parent | cc67bfd8dbae334a121c9d40c13c3816b9eb72a0 (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions