aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-03 21:07:24 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-03 21:07:24 +0100
commit7d7be8efd8eef3b9fcadf83766dd26fb139e0976 (patch)
tree4dadb47aee41a7533e7fd6339a02de69b17a388d /src/main/res
parenta054a3fbb446a89ac479393c1e5f9e3f6396bacd (diff)
parent696dd07a41b638ead79d5a384a96c1cd923a7545 (diff)
Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc
Conflicts: src/main/AndroidManifest.xml
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions