luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 04:24:26 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/settings/preferences
History
Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
..
appearance Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
notifications Fix notifications label (#12517) 2019-12-02 13:39:53 +01:00
other Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00