projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5eab2b6 fa53570)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 13 Apr 2017 00:05:03 +0000 (02:05 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 13 Apr 2017 00:05:03 +0000 (02:05 +0200)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Use list of binds in apache config for syncproxies


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