Merge branch 'unified-jobs' of github.com:ansible/ansible-commander into unified-jobs

Browse Source

Conflicts:
	awx/main/models/__init__.py
	awx/main/models/base.py
	awx/main/models/inventory.py
	awx/main/models/jobs.py
	awx/main/models/projects.py
	awx/main/models/unified_jobs.py
	awx/main/tests/base.py

...

This commit is contained in:

Chris Church 2014-03-24 18:37:44 -04:00

parent 02af35dffd 99c62f1261

commit 871b89ab28

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available