Mastodon

Files

T

Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream

- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.

2021-05-07 18:21:59 +02:00

about

…

accounts

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-07 18:21:59 +02:00

admin

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-07 18:21:59 +02:00

admin_mailer

…

application

…

auth

…

authorize_interactions

…

directories

…

errors

…

filters

…

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

Merge branch 'main' into glitch-soc/merge-upstream

2021-04-05 14:31:07 +02:00

media

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-07 18:21:59 +02:00

notification_mailer

…

oauth

…

public_timelines

…

relationships

…

remote_follow

…

remote_interaction

…

settings

Merge branch 'main' into glitch-soc/merge-upstream

2021-03-15 11:26:59 +01:00

shared

…

statuses

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-07 18:21:59 +02:00