tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d315f1dc02f15b55585a853ac19aefbe6983d87d
Mastodon/app/controllers/settings/preferences_controller.rb
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00

1.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink