diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-11-22 22:32:05 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-11-22 22:32:05 +0100 |
commit | 4720ac94d39af262fdcc249a88b118443f7cac68 (patch) | |
tree | bf938a99a7041a15870628085dca5d899e474f3d /src/main/res/values/attrs.xml | |
parent | 07fe434cc753ee59916adc4bf3c5d5bc03a58bf9 (diff) | |
parent | 1c31b9692027269c8036908aee3df2cdf05369e0 (diff) |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/res/values/attrs.xml')
0 files changed, 0 insertions, 0 deletions