Jeremy Kescher 855b0d4dbb Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb		2023-01-26 17:27:01 +01:00
..
clear_column_button.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
column_settings.js	clean up new imports in vanilla flavour	2022-12-09 23:08:41 +01:00
filter_bar.js	rebase with upstream	2022-12-09 23:08:36 +01:00
follow_request.js	Change in-app links to keep you in-app (#20540)	2022-11-13 21:10:20 +01:00
grant_permission_button.js	Change notification permission handling (#15176)	2020-12-15 18:43:54 +01:00
notification.js	Merge remote-tracking branch 'upstream/main' into develop	2023-01-26 17:27:01 +01:00
notifications_permission_banner.js	Change notification permission handling (#15176)	2020-12-15 18:43:54 +01:00
report.js	Add notifications for new reports (#18697)	2022-06-27 09:30:15 +02:00
setting_toggle.js	Change how missing desktop notifications permission is displayed (#14985)	2020-10-15 16:24:47 +02:00