Steve Küng df7ea0d4d5 Merge branch 'master' of https://github.com/munki/munki into MSCMojave ...

# Conflicts:
#	code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj
#	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/Resources/WebResources/updates.css
#	code/apps/Managed Software Center/Managed Software Center/en-AU.lproj/InfoPlist.strings
#	code/apps/Managed Software Center/Managed Software Center/msclog.swift

2020-03-11 08:02:32 +01:00

..

apps

Merge branch 'master' of https://github.com/munki/munki into MSCMojave

2020-03-11 08:02:32 +01:00

client

Update version.plist for future release versioning

2020-02-10 08:57:04 -08:00

pkgtemplate

New tooling to create the Python 3 framework

2019-08-16 14:32:17 -07:00

server

Replace http://www.apache.org/licenses/LICENSE-2.0 with https://www.apache.org/licenses/LICENSE-2.0

2015-11-13 20:35:24 -08:00

tools

adding quotes to avoid build script failure (#965)

2020-01-07 15:31:19 -08:00