aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-23 21:06:58 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-23 21:06:58 +0200
commitdeb9c20e5e7459c56f5207f3eaf9c189e383475a (patch)
treeedd52471eec291e785bafaef317e2c9b852bf5bf /src/main/res
parent91a3cee6d2ddcb647082b517d2781c00fb1f844d (diff)
parent5a53ff80fbaafb405f88cb4949bb46d8ffc450cc (diff)
Merge branch 'master' into developmentdevelopment
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions