projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91b3b25 9be737c)
Merge branch 'zobel-salsa'
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 15 Feb 2018 07:39:47 +0000 (08:39 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 15 Feb 2018 07:39:47 +0000 (08:39 +0100)

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