tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
7535c607f40cb31fbb68c8f416992c3c5fcc929d
Mastodon/config/routes.rb
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
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.
2019-03-20 13:54:00 +01:00

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink