diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-04 09:57:04 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-04 09:57:04 +0200 |
| commit | c54d30ac003fec40b5263cf9948c20d3163eda7b (patch) | |
| tree | 7d4cfbf918bd4812782c2851d6c838a153ab5f5f /src/main/java/eu/siacs/conversations/persistance | |
| parent | 398eacc0f022aec869cac003e61ced7215c178fa (diff) | |
| parent | 6639d0f23bb983cae7234d6b15f9875464c67093 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/persistance')
0 files changed, 0 insertions, 0 deletions