Jeremy Kescher 499eecf5a0 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml		2022-10-03 17:39:52 +02:00
..
action_bar.js	Merge remote-tracking branch 'upstream/main' into develop	2022-07-18 00:01:32 +02:00
card.js	Replace deprecated String.prototype.substr() (#17949)	2022-04-04 12:19:45 -04:00
detailed_status.js	Add user content translations with configurable backends (#19218)	2022-09-23 23:00:12 +02:00