aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-15 15:51:27 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-15 15:51:27 +0100
commit07b07115d684b27ebc0c3ee4f70ef2e33a3b2dbb (patch)
tree3b19be17a403cfbb2a695e50da9a1b277376ac45 /.gitignore
parent5b9c690c47cbb6fd352d7ddce3b13e6bf119fc22 (diff)
parentbdc86bb8e3667acb4d3f59ece718dc763d59374f (diff)
Merge branch 'feature/foreground_service' into development
Conflicts: src/main/res/values/strings.xml
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions