diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-07-22 14:48:07 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-07-22 14:48:07 +0200 |
| commit | c3ef8e0a5bcc36939a09973352623da1c6ed6b77 (patch) | |
| tree | 82d6cdc1233af1c1140ac21fd927ec1df2acab41 /src/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 66e3ccc2dcd22e2bd7b145b7cbbccccb9366ffcd (diff) | |
| parent | 34dafc24af0e6e3d16a6169fd6e981e4535c23be (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java')
0 files changed, 0 insertions, 0 deletions