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

Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/locales/en.yml
	config/locales/fr.yml
	config/locales/simple_form.pl.yml
	config/themes.yml

Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.

2018-05-21 16:40:02 +02:00

..

chewy

Full-text search for authorized statuses (#6423)

2018-02-09 23:04:47 +01:00

controllers

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

2018-05-21 16:40:02 +02:00

helpers

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

2018-05-19 22:41:10 +02:00

javascript

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

2018-05-21 16:40:02 +02:00

lib

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05:00

mailers

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

models

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

2018-05-19 22:41:10 +02:00

policies

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05: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-05-19 22:41:10 +02:00

services

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

2018-05-21 16:40:02 +02:00

validators

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

views

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

2018-05-19 22:41:10 +02:00

workers

checking http status code with range (#7544)

2018-05-19 14:47:44 +02:00