diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
| commit | 05100b0a4de85edc6c49c15cdc050ed7ece2b3d0 (patch) | |
| tree | f702f2a42f7d09a0d2ff20ca7f9f8b65f64643eb /src/main/java/eu/siacs/conversations/ui/AboutPreference.java | |
| parent | c41e6004909c10d4d24c7030d584f8e9fdf52d7c (diff) | |
| parent | 20ba1add1eaeb43a522189a85471ac3c4e1a3933 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/AboutPreference.java')
0 files changed, 0 insertions, 0 deletions