diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-04 16:35:40 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-04 16:35:40 +0100 |
| commit | ca0d68224ec804cac739ed955390aa7f6a585856 (patch) | |
| tree | e0e8cb976fbac953e49be6f391b053502d5a9fc6 /src/main/java/de/thedevstack/conversationsplus/xmpp/chatstate/ChatState.java | |
| parent | 274a689dce6b903674cc738159bb112dcad17800 (diff) | |
| parent | 96e6604d9eed10d08534ddb6c7a33b7ec9dfc68e (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/chatstate/ChatState.java')
0 files changed, 0 insertions, 0 deletions