mirror of https://framagit.org/tykayn/mastodon.git
1d6152f440
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||