diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-12 23:41:35 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-12 23:41:35 +0100 |
commit | da298cfe5937d9e4ea735f0ed50a5a5d61b9f235 (patch) | |
tree | 041772330bdd053c2b45dc00a71cae25dc525c26 /proguard-project.txt | |
parent | d122d224bb5a17b6cff3b4e0cb3b78ca53785f7f (diff) | |
parent | 38c936b8ef084b6040d6fd2672f9709dede11680 (diff) |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions