This is offered as a convenience for merging recent RenovateBot generated merge requests.
Merge requests !314 (closed), !315 (closed), and !316 (closed) update dependencies in related packages. So !315 (closed) and !316 (closed) produce conflicts. Those conflicts are resolved in this merge request to simplify the version updates.
This is intended to supersede !332 (closed): source branch updated from hdasch/funkwhale-android:m314-316 to funkwhale/funkwhale-android:m314-316