]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85c7554 c826a07)
Merge remote-tracking branch 'shared/master' into feature/squeeze-lts
authorintrigeri <intrigeri@boum.org>
Sat, 7 Feb 2015 16:25:05 +0000 (16:25 +0000)
committerintrigeri <intrigeri@boum.org>
Sat, 7 Feb 2015 16:25:05 +0000 (16:25 +0000)
1  2 
README patch | diff1 | diff2 | blob | history
templates/Debian/sources.list.erb patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc templates/Debian/sources.list.erb
Simple merge
Puppet module for apt