Commit 48d691d2 by Jason Bau

Merge remote-tracking branch 'origin/edx-west/release' into edx-west/release-merge

Conflicts:
	playbooks/roles/edxapp/templates/edx-workers.conf.j2
parents a8777bc5 bb9bab07
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment