projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9be737c 079351c)
Merge remote-tracking branch 'waldi-salsa/godard-apache' into HEAD
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 13 Feb 2018 21:50:36 +0000 (22:50 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 13 Feb 2018 21:50:36 +0000 (22:50 +0100)
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.