tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9712d59dda848a7bc7fd9edb814c16717aa9ba6d
Mastodon/app/controllers/settings/profiles_controller.rb
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00

784 B
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink