diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:17:22 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:17:22 +0200 |
| commit | 5ec8a55ba51aa60862ec77eecb017257105fac80 (patch) | |
| tree | 5988834eb4dd0ce1af72b61dd3d8e29b1d044b83 /src/main/java/eu/siacs/conversations/Config.java | |
| parent | b6025f3506ee5adf5ccf42cefd9c3ff57d9ff1a1 (diff) | |
| parent | 679ac2ea21709d3a4b0e80bdebe740beceac274d (diff) | |
Merge branch 'refs/heads/internal-Image/Video-Viewer'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
0 files changed, 0 insertions, 0 deletions