aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-15 15:52:15 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-15 15:52:15 +0100
commit35bf13f5effd802f57b9f3633115fed479e14f1e (patch)
treeab21e6d9f954ce6ad3b30af6ffcf7180d2ca7484 /build.gradle
parent07b07115d684b27ebc0c3ee4f70ef2e33a3b2dbb (diff)
parent41f7848f2ca48b31ad7fd865490347fe26f60c2b (diff)
Merge branch 'feature/file_transfer' into development
Conflicts: src/main/res/values/strings.xml
Diffstat (limited to 'build.gradle')
0 files changed, 0 insertions, 0 deletions