Skip to content
Snippets Groups Projects
Commit 641b62b5 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '767-broken-admin' into 'master' 

Fix #767: broken Activity and Actor modules in django admin

See merge request funkwhale/funkwhale!684
parents a75d7e95 124a7c3d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment