diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-13 15:40:59 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-13 15:40:59 +0200 |
| commit | a8010e71335daab3dfc3d6d523fd51755c9d6427 (patch) | |
| tree | d9c650a7d247cc268e07293677b44a3f7e5fa179 /src/eu/siacs/conversations/xml | |
| parent | 6dfd885d3428dbf7e4869f883f4424624cbe3da3 (diff) | |
| parent | 84e79040df5cae9f1c32e7a8055d8fd4b0dce531 (diff) | |
Merge branch 'development' into feature/take_picture
Diffstat (limited to 'src/eu/siacs/conversations/xml')
0 files changed, 0 insertions, 0 deletions