diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-27 11:26:09 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-27 11:26:09 +0100 |
| commit | 2c224d0f188127df2ea8d398ccb5904fa6561654 (patch) | |
| tree | aa356b11f936b14e14466a7254e151c728417fb2 /proguard-rules.txt | |
| parent | 60ab03afb119a61503f101da91f54f15124f9373 (diff) | |
| parent | 3cf21e2d3712f40659afbf44296c8ea571d9f7a3 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'proguard-rules.txt')
0 files changed, 0 insertions, 0 deletions