djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-26 09:32:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views/settings/profiles
History
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
..
show.html.haml
Merge branch 'master' into glitch-soc/master
2018-05-10 00:03:28 +02:00