mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-17 00:24:59 +01:00
Code Issues Projects Releases Wiki Activity
143878d9da
mastodon/app/views/settings/profiles
History
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	db/schema.rb
2018-04-14 09:12:50 -05:00
..
show.html.haml Merge remote-tracking branch 'origin/master' into gs-master 2018-04-14 09:12:50 -05:00