aboutsummaryrefslogtreecommitdiffstats
path: root/settings.gradle
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-19 12:49:24 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-19 12:49:24 +0200
commitc9b2638778237b128879bb638932414beef81a4d (patch)
tree75c68070c2e16f8bdbc9c51ba3da47c443c3b2e0 /settings.gradle
parentdafcee6a5bff1ed1938329a8b3d4555d893e8fff (diff)
parent52f0622dd3b3d74311f9326ac523dad17b98356a (diff)
Merge branch 'master' into development
Diffstat (limited to 'settings.gradle')
0 files changed, 0 insertions, 0 deletions