This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	…
deletes	…
exports	…
flavours	…
follower_domains	…
imports	…
migrations	…
notifications	…
preferences	…
profiles	…
shared	…
two_factor_authentication	…
two_factor_authentications	…