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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +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

Add apply-to-mentions option to keyword mute UI. #454.

2018-06-04 02:51:28 -05:00

migrations

…

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/master

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

shared

…

two_factor_authentication

…

two_factor_authentications

…