Shane McDonald 4fdf462b98 Merge branch 'release_3.3.0' into awx/devel ...

# Conflicts:
#	awx/ui/client/src/standard-out/standard-out-factories/main.js
#	awx/ui/package.json

2018-04-27 10:17:59 -04:00

..

files

Merge branch 'release_3.3.0' into awx/devel

2018-04-27 10:17:59 -04:00

tasks

Fix image build role when not deploying to localhost

2018-04-20 00:07:25 -04:00

templates

Install unzip to enable usage of unarchive module

2018-04-20 09:17:27 +02:00