diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:51:01 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:51:01 +0200 |
| commit | e3bb47e14731bb93fbfced3fe9e0fbd30886311e (patch) | |
| tree | c00f531011e63167bcb844a73abdb3725220492d /src/main/java/eu/siacs/conversations/Config.java | |
| parent | 85d9a6175a718bfda840fa9db6746064aa05e32c (diff) | |
| parent | ce0888b07763c89f1b204cba7d40cb3020a2ac88 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
0 files changed, 0 insertions, 0 deletions