Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ...

Merge upstream changes right before the public profile redesign.

2018-07-30 14:39:06 +02:00

..

chewy

…

controllers

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

2018-07-17 22:05:25 +02:00

helpers

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

2018-07-26 21:22:43 +02:00

javascript

Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream

2018-07-30 14:39:06 +02:00

lib

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

2018-07-17 22:05:25 +02:00

mailers

…

models

Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream

2018-07-30 14:39:06 +02:00

policies

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

2018-07-16 14:50:42 +02:00

presenters

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-04 18:17:32 +00:00

serializers

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

2018-07-16 14:50:42 +02:00

services

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

2018-07-17 22:05:25 +02:00

validators

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

2018-07-26 21:22:43 +02:00

views

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

2018-07-17 22:05:25 +02:00

workers

Fix ActivityPub::UpdateDistributionWorker regression (#8039)

2018-07-16 18:43:22 +02:00