Commit graph

5 commits

Author SHA1 Message Date
intrigeri
71d42350d1 Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.
Merging one more commit.

Conflicts:
	files/preferences
	templates/Debian/sources.list.deb-src.erb
	templates/Debian/sources.list.volatile.erb
	templates/Ubuntu/sources.list.backports.erb
	templates/Ubuntu/sources.list.deb-src.erb
2010-11-21 16:38:50 +01:00
Gabriel Filion
1b0bc41597 Add file headers for awareness of puppet presence
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25 01:13:44 -04:00
intrigeri
e2f80db7b7 Bring in a bit of Ubuntu support from Nadir. 2010-10-17 01:35:37 +02:00
nadir
db06babc5d removed backports template in favor of main sources.list 2010-10-09 13:42:26 +02:00
Varac
5972a35566 Increased Ubuntu support 2009-12-17 15:53:27 +01:00
Renamed from templates/sources.list.erb (Browse further)