gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20241113

Browse source
This commit is contained in:
KMY 2024-11-13 08:17:38 +09:00
commit 910eafda63
177 changed files with 1625 additions and 659 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/ui/index.jsx
View file

@ -512,7 +512,9 @@ class UI extends PureComponent {
}
};
handleHotkeyBack = () => {
handleHotkeyBack = e => {
e.preventDefault();
const { history } = this.props;
if (history.location?.state?.fromMastodon) {