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

Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).

2018-11-27 13:23:02 +01:00

..

chewy

…

controllers

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

2018-11-27 13:23:02 +01:00

helpers

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

2018-11-27 13:23:02 +01:00

javascript

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

2018-11-27 13:23:02 +01:00

lib

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

2018-11-27 13:23:02 +01:00

mailers

…

models

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

2018-11-27 13:23:02 +01:00

policies

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

2018-10-22 17:51:38 +02:00

presenters

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

2018-11-27 13:23:02 +01:00

serializers

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

2018-11-27 13:23:02 +01:00

services

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

2018-11-27 13:23:02 +01:00

validators

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

2018-11-09 14:56:31 +01:00

views

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

2018-11-27 13:23:02 +01:00

workers

Optimize the process of following someone (#9220)

2018-11-08 21:05:42 +01:00