Revert "Merge branch 'release_3.0.0' into devel"

This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.
This commit is contained in:
Matthew Jones
2016-07-07 12:40:10 -04:00
parent 22437f80ed
commit 6b73fb2c27
321 changed files with 8400 additions and 8261 deletions

View File

@@ -47,4 +47,5 @@ WSGIPythonHome /var/lib/awx/venv/tower
</IfVersion>
</Directory>
Include conf.d/awx-munin.conf
</VirtualHost>