diff options
author | Michael <betheg@bitcloner.org> | 2014-08-30 14:00:53 +0200 |
---|---|---|
committer | Michael <betheg@bitcloner.org> | 2014-08-30 14:00:53 +0200 |
commit | 969cba5ee6fa74460d85930a627a685cd6876ca3 (patch) | |
tree | a681a9b365fc3de0b67ea43cf8ef3bcecfb60dd8 /src/eu/siacs/conversations/ui | |
parent | 3714947d5f9307b173fdaf7b0fc08d92fd824553 (diff) | |
parent | 9eafb1008676747a3ff315fb820178641c7b09f3 (diff) |
Merge remote-tracking branch 'upstream/development' into fix_typo
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions