tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b
Mastodon/app/javascript/mastodon/locales/en.json
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00

23 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink