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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +02:00
..
assets	…
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
json_ld	Preload common JSON-LD contexts (#9412)	2018-12-02 16:46:13 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-26 15:41:40 +02:00
paperclip	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00