diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-02 21:16:04 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-02 21:16:04 +0200 |
| commit | 124aab11c5cf8fce408d97ccdc28d4aae3f33663 (patch) | |
| tree | 00cfbeb67955892c4a9937672b13d1b452f5a0f8 /src/main/java/eu/siacs/conversations/persistance | |
| parent | 1ea3287d6faec8b336a54eb83a302ea725681687 (diff) | |
| parent | 594aab56dbffab5eec5d922f30cec3262752ceb4 (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