main.yml
6.27 KB
-
Merge branch 'e0d/edx-notes-api' into max/merge-refactor · 58e7037f
Conflicts: CHANGELOG.md playbooks/roles/edxapp/tasks/deploy.yml playbooks/roles/insights/defaults/main.yml playbooks/roles/xqwatcher/tasks/deploy_watcher.yml
Max Rothman committed