summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2015-05-09 10:02:05 +0200
committerDaniel Friesel <derf@finalrewind.org>2015-05-09 10:02:05 +0200
commitf2d2e5bda1cf5789b75773ae35c6f6dcb01c71fe (patch)
tree21eab82f72c66c60c69ae359a35853081306164a /COPYING
parentfd5b343a0b56e0e887ab514b38496212beac7b8d (diff)
parenta58a9a6c73057275e1b05e4196110864d6146e51 (diff)
Merge branch 'master' of lastlight:var/git_root/Travel-Status-DE-DeutscheBahn
Conflicts: Changelog
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions