James Cammarata 360ffc4dfd Properly merge role conditionals in with pre-existing conditionals ... Fixes #7387		2014-05-14 01:45:35 -05:00
..
__init__.py	Merge pull request #5555 from sivel/expose-playbook-to-callback	2014-04-03 17:01:28 -04:00
play.py	Properly merge role conditionals in with pre-existing conditionals	2014-05-14 01:45:35 -05:00
task.py	Improve error message when multiple action are given	2014-04-20 20:32:33 +02:00