Age | Commit message (Collapse) | Author | |
---|---|---|---|
2017-10-23 | Merge commit '1bfffe2e0adff6e44ec33726988b64f95ea2f599' into develop | Silvio Rhatto | |
2015-11-06 | Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop | Silvio Rhatto | |
Conflicts: puppet/puppet.conf |