diff options
| author | Christian S <christian@pix-art.de> | 2015-10-22 20:31:08 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-10-22 20:31:08 +0200 |
| commit | 2c179a1d41c50f74049ed794bcb1dfdb7de30870 (patch) | |
| tree | a321d6931b6b37906e3a1b4e8f308ef2bbf5e13c /src/main/java/eu/siacs/conversations/utils | |
| parent | 83ec2b12552b533a3b5cc7a7e8ec695d17bbf447 (diff) | |
| parent | 1bd68a42b20949f7880cc8aa51d472e363830c7f (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
0 files changed, 0 insertions, 0 deletions