diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-03 22:17:16 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-03 22:17:16 +0200 |
commit | 59f02f77669b014445792fb431dbdeb6814dec34 (patch) | |
tree | 94b5a5b396e764e6196494af2372ce9cb12ebd4b /src/main/res | |
parent | cef2eb58a76ee11b277c3d861d57cb4684e81fef (diff) | |
parent | cfa31beaf7833fc161fe508d7fad470b86f5a626 (diff) |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions