mirror of
https://github.com/funamitech/mastodon
synced 2024-12-03 01:09:08 +09:00
656a41db2a
Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system. |
||
|---|---|---|
| .. | ||
| chewy | ||
| controllers | ||
| helpers | ||
| javascript | ||
| lib | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| serializers | ||
| services | ||
| validators | ||
| views | ||
| workers | ||