nyastodon/app
Jeremy Kescher 3d2fc73ecb
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/mastodon/initial_state.js
2022-11-02 21:12:42 +01:00
..
chewy Revert reverting "Change algorithm of tootctl search deploy to improve performance (#18463)". 2022-05-26 20:58:16 +02:00
controllers Merge remote-tracking branch 'upstream/main' into develop 2022-11-02 21:12:42 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
javascript Merge remote-tracking branch 'upstream/main' into develop 2022-11-02 21:12:42 +01:00
lib Merge remote-tracking branch 'upstream/main' into develop 2022-10-31 21:37:48 +01:00
mailers Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
models Merge remote-tracking branch 'upstream/main' into develop 2022-10-31 21:37:48 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Fix remote account in contact account setting not being used (#19351) 2022-10-21 14:07:02 +02:00
serializers Improve min poll options, expose value in API 2022-11-01 10:29:44 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
validators Merge remote-tracking branch 'upstream/main' into develop 2022-10-31 21:37:48 +01:00
views Merge remote-tracking branch 'upstream/main' into develop 2022-10-31 21:37:48 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00