mirror of
https://github.com/munki/munki.git
synced 2026-05-06 20:39:30 -05:00
1b3cb211b6
# Conflicts: # code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj # code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift # code/apps/Managed Software Center/Managed Software Center/Info.plist # code/apps/Managed Software Center/Managed Software Center/de.lproj/Localizable.strings