diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:38:06 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:38:06 +0200 |
| commit | c23642b8cd2c06c5f3e9cf7f88d31ed5c6f78614 (patch) | |
| tree | a7c53e5dd6dd6e85213cff834d35316a29617753 /src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java | |
| parent | 2cdc31a6887f242dfe4faca91af63ffd4e74ef67 (diff) | |
| parent | ea6a008b39b0f669f66f3c8aec08b4deb3ece154 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java')
0 files changed, 0 insertions, 0 deletions