mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +09:00
395b9011ee
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
---|---|---|
.. | ||
challenges | ||
confirmations | ||
passwords | ||
registrations | ||
sessions | ||
setup | ||
shared |