mirror of https://framagit.org/tykayn/mastodon.git
45fce0e496
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml |
||
|---|---|---|
| .. | ||
| _follow_button.html.haml | ||
| _follow_grid.html.haml | ||
| _grid_card.html.haml | ||
| _header.html.haml | ||
| _moved_strip.html.haml | ||
| _nothing_here.html.haml | ||
| _og.html.haml | ||
| show.html.haml | ||