Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

chewy

…

controllers

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

2020-01-24 14:37:06 +01:00

helpers

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

2020-01-24 14:37:06 +01:00

javascript

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

2020-01-24 14:37:06 +01:00

lib

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

2020-01-24 14:37:06 +01:00

mailers

…

models

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

2020-01-24 14:37:06 +01:00

policies

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

2020-01-24 14:37:06 +01:00

presenters

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

2019-11-30 17:29:44 +01:00

serializers

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

2020-01-24 14:37:06 +01:00

services

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

2020-01-12 15:57:34 +01:00

validators

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

2020-01-24 14:37:06 +01:00

views

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

2020-01-24 14:37:06 +01:00

workers

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

2020-01-24 14:37:06 +01:00