main.yml
3.78 KB
-
Merge branch 'master' of github.com:edx/configuration into sef/notifier-west · d9f4c00a
Conflicts: playbooks/roles/notifier/tasks/deploy.yml playbooks/roles/notifier/tasks/main.yml
Sef Kloninger committed
Conflicts: playbooks/roles/notifier/tasks/deploy.yml playbooks/roles/notifier/tasks/main.yml