Merge branch 'master' of https://github.com/pestaa/cdist

Browse source

Conflicts:
	conf/type/__start_on_boot/gencode-remote

...

This commit is contained in:

pestaa 2012-04-06 11:20:39 +02:00

parent f9c945cc86 cb47a7d56f

commit cd5050cc91

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available