summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorMatthew Jones <matburt@redhat.com>2016-07-21 16:49:50 +0200
committerMatthew Jones <matburt@redhat.com>2016-07-21 16:49:50 +0200
commit1208450f59fd2786aae856657f034c16aafc8520 (patch)
tree5469f011471ba5c79c0c8df13df3ff968a91476a /README.md
parentMerge branch 'release_3.0.0' into devel (diff)
parentMerge branch 'release_3.0.0' into stable (diff)
downloadawx-1208450f59fd2786aae856657f034c16aafc8520.tar.xz
awx-1208450f59fd2786aae856657f034c16aafc8520.zip
Merge branch 'stable' into devel
* stable: Update 3.0 changelogs Spacing in sh script on merge conflict Update setup for bundled ansible-2 dependencies fix ansible2.0 bundle deps bootstrap Use yum's compare_providers() function instead of just pulling the latest alphabetically.
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions