fd81fc6c

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into edit-caption

# Conflicts:
#	store/sqlite/media.go
configuredevShellbackendbackend-devcheck-bashcheck-frontendcheck-go-formattingcheck-go-test-packagescheck-trailing-newlinecheck-trailing-whitespacedeploy-to-flydiagramdocker-imagee2e-testsgo-testsimport-from-tinybeanslint-sqllittle-momentslittle-moments-devx86_64-linux