mirror of
https://github.com/munki/munki.git
synced 2026-05-20 21:28:36 -05:00
Steve Küng
26fd94706c
# Conflicts: # code/apps/Managed Software Center/Managed Software Center.xcodeproj/Localization.swift # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/AllItemsTemplate.imageset/AllItemsTemplate.png # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/AllItemsTemplate.imageset/Contents.json # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/Contents.json # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/MyStuffTemplate.imageset/Contents.json # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/MyStuffTemplate.imageset/MyStuffTemplate.png # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/toolbarCategoriesTemplate.imageset/Contents.json # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/toolbarCategoriesTemplate.imageset/toolbarCategoriesTemplate.pdf # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/updatesTemplate.imageset/Contents.json # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/updatesTemplate.imageset/updatesTemplate.png # code/apps/Managed Software Center/Managed Software Center/Base.lproj/MainMenu.xib # code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift # code/apps/Managed Software Center/Managed Software Center/MSCTableCellView.swift # code/apps/Managed Software Center/Managed Software Center/MSCTableRowView.swift # code/apps/Managed Software Center/Managed Software Center/Resources/templates/detail_template.html # code/apps/Managed Software Center/Managed Software Center/Resources/templates/list_template.html # code/apps/Managed Software Center/Managed Software Center/Resources/templates/myitems_template.html # code/apps/Managed Software Center/Managed Software Center/Resources/templates/updatedetail_template.html # code/apps/Managed Software Center/Managed Software Center/Resources/templates/updates_template.html # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/Contents.json # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/munkiLogoTemplate.imageset/Contents.json # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/munkiLogoTemplate.imageset/icon_512x512@2x.png # code/apps/MunkiStatus/MunkiStatus/Base.lproj/MainMenu.xib # code/apps/MunkiStatus/MunkiStatus/MSWindow.swift # code/apps/swift/Managed Software Center/Managed Software Center/Assets.xcassets/Contents.json # code/apps/swift/MunkiStatus/MunkiStatus.xcodeproj/project.pbxproj
