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

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

applications

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

deletes

…

exports

Better singulars of account followers/toots. (#8471)

2018-08-26 21:30:53 +02:00

flavours

…

follower_domains

…

imports

Show exact number of followers/statuses on export page/in tooltip (#8199)

2018-08-14 21:56:17 +02:00

migrations

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

notifications

…

preferences

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

2018-06-21 20:49:57 +02:00

profiles

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

2018-08-01 00:18:13 +02:00

shared

…

two_factor_authentication

…

two_factor_authentications

…