diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-03 21:22:26 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-03 21:22:26 +0100 |
| commit | 08cb23a88675bec7a382a8cdd463e9ea10358f64 (patch) | |
| tree | 60745da206ddc791e5711eed9e448cc363dd30df /src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | |
| parent | 7d7be8efd8eef3b9fcadf83766dd26fb139e0976 (diff) | |
fixed merge error
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java')
0 files changed, 0 insertions, 0 deletions