diff options
| author | Christian S <christian@pix-art.de> | 2015-09-20 15:08:38 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-20 15:08:38 +0200 |
| commit | eeb7cfc01187bcd15e81d82f0e619f9d5823e28f (patch) | |
| tree | 5783b12b6b10832b367508fe838158010abd3902 /src/main/java/eu/siacs/conversations/persistance | |
| parent | c6b1c2412e2669f603977faf080e5835b677adee (diff) | |
| parent | c69c439c32a4c265690e4ec6ec8823284fde4503 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/persistance')
0 files changed, 0 insertions, 0 deletions