diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-16 17:54:53 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-16 17:54:53 +0200 |
| commit | bceee45b463dc6113301ba82cb636ecd9e0c509c (patch) | |
| tree | ab1ca8f9e85354d72441cacf0f75ed01b16896e7 /src/main/java/eu/siacs/conversations/Config.java | |
| parent | bd1a2228d2f3392ee4cf891bcc07c30ccb363bfa (diff) | |
| parent | 6f1a4494eb89b0b5db8bbfa4718593b5c236e477 (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