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

Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock

2019-06-19 18:36:16 +02:00

..

controllers

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

2019-06-10 18:59:53 +02:00

fabricators

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

2019-05-15 17:11:40 +02:00

features

…

fixtures

Export and import show_reblogs together with following list (#10495)

2019-04-08 07:28:27 +02:00

helpers

…

lib

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

2019-06-19 18:36:16 +02:00

mailers

Add invite request to pending account notification e-mail (#10528)

2019-04-10 00:36:01 +02:00

models

Update remote bio test from 160 to 500 (#10799)

2019-05-21 13:29:06 +02:00

policies

…

presenters

…

requests

…

routing

…

serializers/activitypub

…

services

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

2019-06-03 14:54:30 +02:00

support

…

validators

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

2019-05-19 21:53:44 +02:00

views

…

workers

…

rails_helper.rb

…

spec_helper.rb

…