HomeSoftware Heritage

Merge branch 'sync'

Description

Merge branch 'sync'

  1. Conflicts:
  2. lib/puppet/provider/mysql_login_path/mysql_login_path.rb

Event Timeline

Andreas Stuerz <andreas.stuerz@markt.de> committed rSPMY236e5a8eff34: Merge branch 'sync' (authored by Andreas Stuerz <andreas.stuerz@markt.de>).Aug 18 2021, 1:59 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.