]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70f64e6 467b8fc)
Merge branch 'merge'
authorPeter Palfrader <peter@palfrader.org>
Thu, 26 Jun 2014 20:34:45 +0000 (22:34 +0200)
committerPeter Palfrader <peter@palfrader.org>
Thu, 26 Jun 2014 20:34:45 +0000 (22:34 +0200)
* merge:
  security_mirror: use /srv/ instead of deprecated /org/


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