Thibaut Girka bcf157a1a9 Avoid loading rails-ujs twice on vanilla flavour

2018-07-16 16:42:52 +02:00

..

chewy

…

controllers

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

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

helpers

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

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

javascript

Avoid loading rails-ujs twice on vanilla flavour

2018-07-16 16:42:52 +02:00

lib

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

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

mailers

…

models

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

2018-07-16 14:50:42 +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-16 14:50:42 +02:00

validators

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

2018-07-09 07:13:59 +02:00

views

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

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

workers

Add federation relay support (#7998)

2018-07-13 02:16:06 +02:00