aboutsummaryrefslogtreecommitdiff
path: root/puppet/modules/site_users/manifests
AgeCommit message (Collapse)Author
2015-11-06Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into developSilvio Rhatto
Conflicts: puppet/puppet.conf