Merge remote-tracking branch 'origin/master' into stable.
authorBen Sturmfels <ben@sturm.com.au>
Mon, 4 May 2020 03:33:27 +0000 (13:33 +1000)
committerBen Sturmfels <ben@sturm.com.au>
Mon, 4 May 2020 03:33:27 +0000 (13:33 +1000)
1  2 
mediagoblin/edit/views.py
setup.py

Simple merge
diff --cc setup.py
Simple merge