tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
15a37a967cdf5bd1e935efc8866f6ac40d49db6b
Mastodon/app/presenters/instance_presenter.rb
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

1.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink