diff options
| author | Christian S <christian@pix-art.de> | 2015-07-08 19:39:40 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-08 19:39:40 +0200 |
| commit | 03e6bff7b2c3b7cf851e1522d68238b92e954900 (patch) | |
| tree | 47c3b1ba716cb45e7ae9a29eeed7f1fdaa3108ab /src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | |
| parent | 71d02ff64c87ea5a44b9b8def01e02379ac341db (diff) | |
| parent | 3ac8ed8c6ec03fbcba5796a34b4134fb0fe72e3b (diff) | |
Merge remote-tracking branch 'origin/patch-1' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java')
0 files changed, 0 insertions, 0 deletions