diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-19 12:49:24 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-19 12:49:24 +0200 |
| commit | c9b2638778237b128879bb638932414beef81a4d (patch) | |
| tree | 75c68070c2e16f8bdbc9c51ba3da47c443c3b2e0 /src/main/java/eu/siacs/conversations/persistance | |
| parent | dafcee6a5bff1ed1938329a8b3d4555d893e8fff (diff) | |
| parent | 52f0622dd3b3d74311f9326ac523dad17b98356a (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/persistance')
0 files changed, 0 insertions, 0 deletions