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

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

2018-12-09 16:08:04 +01:00

..

applications

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

deletes

…

exports

Group reports by target account (#8674)

2018-09-13 03:44:08 +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

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

migrations

Redesign public profiles and toots (#8068)

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

notifications

Add preference for report notification e-mails, skip for duplicates (#8559)

2018-09-02 00:11:58 +02:00

preferences

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

2018-12-09 16:08:04 +01:00

profiles

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

2018-12-09 16:08:04 +01:00

shared

…

two_factor_authentication

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

two_factor_authentications

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00