aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-05-20 18:08:15 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-05-20 18:08:15 -0300
commit7c548c9878a5e0cecca771a6b7a739af98c21f4e (patch)
tree03608d69b10bd1d8c35b648edc6da0b546726768 /LICENSE
parentee15eb570d941ac4113bfad37a539a7e3636f8d2 (diff)
parentc38be6cb7c2cbd53a133291b2750d053877ebe4f (diff)
downloadpuppet-apt-7c548c9878a5e0cecca771a6b7a739af98c21f4e.tar.gz
puppet-apt-7c548c9878a5e0cecca771a6b7a739af98c21f4e.tar.bz2
Merge branch 'master' of ssh://labs.riseup.net/shared-apt
Conflicts: manifests/init.pp
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions