Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		2018-09-03 14:33:06 +02:00
..
applications	…
deletes	…
exports	Better singulars of account followers/toots. (#8471)	2018-08-26 21:30:53 +02:00
flavours	…
follower_domains	…
imports	…
migrations	…
notifications	Add preference for report notification e-mails, skip for duplicates (#8559)	2018-09-02 00:11:58 +02:00
preferences	…
profiles	…
shared	…
two_factor_authentication	…
two_factor_authentications	…