Merge branch 'master' of https://git.101010.fr/puppet/proxmox

Browse Source

Conflicts:
	metadata.json

...

This commit is contained in:

gardouille 2015-01-07 13:39:45 +01:00

parent d4afbfa9d0 8219c1003d

commit 552db370cd

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available