summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-09-05 22:32:59 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-09-05 22:32:59 +0200
commit6a3c5a588240760f577cf090c5e484b821af1873 (patch)
treed527e9ced7d531815e9d43bec38e62a6cd53de36 /ChangeLog
parenta38d6e8f8417b777925660269969ce2d353808ef (diff)
parentb0132ba11e2c7609d7b50ffa56532a357efe6e2a (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions