luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-24 14:17:08 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
2020-11-08 14:20:35 +01:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
mailers Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00