customize to munkiwebadmin subpath
smc munkiwebadmin
smc munkiwebadmin
Initial commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Initial Commit to Fork of MunkiWebAdmin
config for running on  apache subpath /munkiwebadmin
Adjustments for /munkiwebadmin subpath
okcommit
Merge remote-tracking branch 'custom/master'

Conflicts:
	manifests/templates/manifests/detail.html
	reports/templates/reports/overview.html
make manifest views.py redirect relative for adding/deleting manifest
Adjustments for /munkiwebadmin subpath
Merge branch 'master' of https://github.com/eahrold/munkiwebadmin

Conflicts:
	manifests/views.py
fix {% url home % } for future compatability
Merge branch 'master' of https://github.com/eahrold/munkiwebadmin

Conflicts:
	OSX/OS X Install instructions.md
	OSX/httpd_munkiwebadmin.conf
	OSX/munkiwebadmin.wsgi
	README.md
	reports/templates/reports/overview.html
	templates/base.html
	templates/registration/login.html