Shane McDonald 00ce244716 Merge pull request #822 from jakemcdermott/fix-merge-issues ...

fix merge issue with inventory source service

2017-12-13 13:32:13 -05:00

..

api

use credential property that returns integers

2017-12-13 12:54:32 -05:00

conf

Merge remote-tracking branch 'tower/release_3.2.2' into devel

2017-12-13 12:25:47 -05:00

lib

update tests to new Ansible core code

2017-12-01 12:31:56 -05:00

locale

Pull updated translations

2017-12-11 09:42:06 -05:00

main

more test cleanup from 3.2.2 merge

2017-12-13 13:14:22 -05:00

playbooks

Merge remote-tracking branch 'tower/release_3.2.2' into devel

2017-12-13 12:25:47 -05:00

plugins

Merge remote-tracking branch 'tower/release_3.2.2' into devel

2017-12-13 12:25:47 -05:00

settings

Merge remote-tracking branch 'tower/release_3.2.2' into devel

2017-12-13 12:25:47 -05:00

sso

Merge remote-tracking branch 'tower/release_3.2.2' into devel

2017-12-13 12:25:47 -05:00

static

Update .gitignore, remove ui static file from wrong dir

2017-07-25 09:39:06 -04:00

templates

Fix migration issues, tests, and templates

2017-11-09 17:29:48 -05:00

ui

fix merge issue with inventory source service

2017-12-13 13:23:15 -05:00

__init__.py

Update celery environ and tasks

2017-11-09 17:21:19 -05:00

asgi.py

…

celery.py

Update celery environ and tasks

2017-11-09 17:21:19 -05:00

devonly.py

…

urls.py

Flake8 fixes and URL updates

2017-11-10 17:04:33 -05:00

wsgi.py

…