tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
0d6b8f36aaee9c8c68c64ce4a63bcc66c6faf78d
Mastodon/config/locales/oc.yml
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00

47 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink