merging the new mastodon for android version into my code is going quite well btw; most things are already merged and working. what's left to do is moving the megalodon settings into the new settings UI, re-add some megalodon features that i haven't properly merged, loads of refinements (see https://github.com/sk22/megalodon/issues)..

and then i'll try to figure out how i can get git to recognize that i've basically already applied all the changes by hand when finally and actually running "git merge"

@megalodon you can apply your changes followed by a git merge ignoring all diffs from mastodon app source just to move the ref to point back to the top of the history 😊