Claire 10a31a934f Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream's README got updated, but we have a completely different one.
  Kept ours.

2021-05-27 17:58:44 +02:00

..

chewy

Change tootctl search deploy algorithm (#14300)

2020-07-14 18:10:35 +02:00

controllers

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

2021-05-27 17:58:44 +02:00

helpers

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

2021-05-22 13:11:31 +02:00

javascript

[Glitch] Remove duplicate CSS properties

2021-05-22 13:22:26 +02:00

lib

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

2021-05-22 13:11:31 +02:00

mailers

Prepare Mastodon for Rails 6 (#15911)

2021-03-17 10:09:55 +01:00

models

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

2021-05-17 10:30:34 +02:00

policies

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

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

presenters

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

2021-02-22 15:23:46 +01:00

serializers

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

2021-05-17 10:30:34 +02:00

services

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

2021-05-22 13:11:31 +02:00

validators

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

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

views

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

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

workers

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

2021-05-22 13:11:31 +02:00