diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-08 12:55:03 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-08 12:55:03 +0100 |
| commit | 48f3922fe652fea8d7b97afe90868d5d4ab290f7 (patch) | |
| tree | e47b0a621c4717c39daf00ff1741dc4b02ebb0f2 /src/main/java/de/thedevstack/conversationsplus/xmpp | |
| parent | 2b86b686c52c3d82ad01a8ff81c5766d64050b62 (diff) | |
Fixed merge issue with AxolotlService (differentiation between impl and interface)
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp')
0 files changed, 0 insertions, 0 deletions