mastodon/app
Holly 6dcb18ea80 fix merge conflict due to "toot" in locale 2023-02-19 19:31:59 +00:00
..
chewy Change algorithm of `tootctl search deploy` to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
javascript fix merge conflict due to "toot" in locale 2023-02-19 19:31:59 +00:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00
mailers Add single splat to callback method definitions to avoid ArgumentError (#22246) 2022-12-13 20:03:16 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 13:48:21 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Add setting for status page URL (#23390) 2023-02-04 04:56:06 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
validators fix merge conflict due to "toot" in locale 2023-02-19 19:31:59 +00:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00