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 | |||
2014-10-01 | Merge commit '587f206824274d7d1cfcb1072ea8f818493bd317' | Silvio Rhatto | |
2014-09-18 | Merge commit '529cd5077e3d76c1d5b612bc146ab174d7143c30' as 'puppet' | Silvio Rhatto | |