diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-10-15 22:40:05 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-10-15 22:40:05 +0200 |
commit | e891f076f2b479146fc7ecce3763bf500919df43 (patch) | |
tree | 8b6fbb891b06ac8a5a9ba59f56229d4b61183e70 /src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java | |
parent | 0265bd05bf7ef6ee14c85ae87831bcc42a4b02cd (diff) | |
parent | 7206541a7b951c03297b7cc7bec02a0f18ac7bd4 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java')
0 files changed, 0 insertions, 0 deletions