tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b6f76d130600ded7f0f2cb585d8b9732e7aa1cff
Mastodon/app/controllers/application_controller.rb
Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00

7.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink