You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.		1 year ago
..
chewy	Fix `#hashtag` matching non-hashtagged posts in search (#26781)	1 year ago
controllers	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
helpers	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	1 year ago
javascript	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
lib	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
mailers	Add admin notifications for new Mastodon versions (#26582)	1 year ago
models	Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	1 year ago
policies	Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream	1 year ago
presenters	Add admin notifications for new Mastodon versions (#26582)	1 year ago
serializers	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
services	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
validators	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	1 year ago
views	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
workers	Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream	1 year ago