release/2018-08-25.21
default avatar
hudson@instructure.com
81c63c9c · fix merge conflict resolution from edc2e731 · 
canvas release release/2018-08-25.21