101051 posts 293 follows 2737 followers
#Android が好きです。#FlokoROM といくつかのサーバと茜ちゃんの面倒を見ています。
https://mstdn.maud.io/@hota$ git merge tootsuite/master
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/javascript/mastodon/features/ui/components/media_modal.js