aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-07-10 15:21:27 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-10 15:21:27 +0200
commitee3d15765df6162b7c0b5f295eaabc3e868a116a (patch)
tree09ff227e989a0b99a557d7fac9660bc79e445e8d /src/main/res
parentb73901c3aedf4c9f5f6b77b5354b97701ba91e49 (diff)
parent81af16fb6cf71ac5a3e6732cb937e182b9134e2f (diff)
Merge branch 'development'
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions