tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
89d2859296bc5a57a8db07be86239cc938a3f691
Mastodon/app/controllers/settings/notifications_controller.rb
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00

688 B
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink