d374ecba

By: Michael Lynch <git@mtlynch.io>

Merge branch 'delete-media/1/show-delete-option' into delete-media/2/delete-media