Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

applications

…

deletes

…

exports

Add hint about 7 day cooldown for archive takeout (#7375)

2018-05-06 10:53:10 +02:00

flavours

Don't show skins selector when there's only one (#256)

2018-01-08 16:45:32 -08:00

follower_domains

…

imports

…

keyword_mutes

…

migrations

Add UI for setting up account migration (#5832)

2017-11-27 22:47:06 +01:00

notifications

…

preferences

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

2018-03-02 21:46:44 -06:00

profiles

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

shared

…

two_factor_authentication

…

two_factor_authentications

…