diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-05-20 18:08:15 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-05-20 18:08:15 -0300 |
| commit | 7c548c9878a5e0cecca771a6b7a739af98c21f4e (patch) | |
| tree | 03608d69b10bd1d8c35b648edc6da0b546726768 /manifests/preferences_snippet.pp | |
| parent | ee15eb570d941ac4113bfad37a539a7e3636f8d2 (diff) | |
| parent | c38be6cb7c2cbd53a133291b2750d053877ebe4f (diff) | |
| download | puppet-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 'manifests/preferences_snippet.pp')
0 files changed, 0 insertions, 0 deletions