diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-05-09 20:57:08 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-05-09 20:57:08 +0200 |
| commit | f0eb80eb5cdf1b61b6c6d00d436d86650b8b3b43 (patch) | |
| tree | 46177630f39f7af7a526499ac198fb47a5ce0423 /src/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | b6fa18a5952d4eb9c1764165ffa4091e7c57aa32 (diff) | |
| parent | 95504f5505a39f50901c2951ba6fcefc67a8825e (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationActivity.java')
0 files changed, 0 insertions, 0 deletions