djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-14 19:53:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views/settings/preferences
History
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
      app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
..
show.html.haml
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2018-02-02 08:39:52 -06:00