Merge remote-tracking branch 'origin/master' into fix/jbau/edxapp_instead_of_lms_cms_in_production
Conflicts: playbooks/edx-west/edxapp_prod.yml
Showing
playbooks/roles/nginx/templates/xqueue.j2
0 → 100644
playbooks/roles/xqueue/handlers/main.yml
0 → 100644
playbooks/roles/xqueue/tasks/deploy.yml
0 → 100644
playbooks/roles/xqueue/tasks/main.yml
0 → 100644
playbooks/roles/xqueue/vars/main.yml
0 → 100644
Please
register
or
sign in
to comment