diff options
| author | Christian S <christian@pix-art.de> | 2015-07-03 17:38:32 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-03 17:38:32 +0200 |
| commit | 357cd3d28b0c87942c4626ac0006ca9b93ad9c68 (patch) | |
| tree | 95d325b6d440368d815945d08c55e966f9f1798e /src/main/java/eu/siacs/conversations/Config.java | |
| parent | c745fbb562b6f25cb57a06538b4c54fdfe619fa3 (diff) | |
| parent | bfe1d2489ae41f21c2899c6eea4273357a6aa20b (diff) | |
Merge remote-tracking branch 'origin/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
0 files changed, 0 insertions, 0 deletions