Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Dec 12, 2023
2 parents 2b3b784 + 1b7119e commit 94ffe16
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/changelogs/v2.11.2/v2.11.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Below are the detailed changes in this version.
* [Drag-and-move blocks should not be allowed in read-only mode](https://github.com/siyuan-note/siyuan/issues/9835)
* [Add `Exit the application` to the main menu for Desktop and Pad](https://github.com/siyuan-note/siyuan/issues/9840)
* [Improve kernel stability by eliminating some data races](https://github.com/siyuan-note/siyuan/issues/9842)
* [Improve image loading and jump positioning caused by height changes](https://github.com/siyuan-note/siyuan/issues/9856)

### Abolishment

Expand Down
1 change: 1 addition & 0 deletions app/changelogs/v2.11.2/v2.11.2_zh_CHT.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* [唯讀模式下不應該允許拖曳區塊](https://github.com/siyuan-note/siyuan/issues/9835)
* [在桌面端端和平板端的主選單中加入 `退出應用程式`](https://github.com/siyuan-note/siyuan/issues/9840)
* [消除資料競態以提升內核穩定性](https://github.com/siyuan-note/siyuan/issues/9842)
* [改进图片加载引起高度变化跳转定位](https://github.com/siyuan-note/siyuan/issues/9856)

### 移除功能

Expand Down
1 change: 1 addition & 0 deletions app/changelogs/v2.11.2/v2.11.2_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* [只读模式下不应该允许拖拽块](https://github.com/siyuan-note/siyuan/issues/9835)
* [在桌面端端和平板端的主菜单中添加 `退出应用`](https://github.com/siyuan-note/siyuan/issues/9840)
* [消除数据竞态以提升内核稳定性](https://github.com/siyuan-note/siyuan/issues/9842)
* [改进图片加载导致高度变化跳转定位](https://github.com/siyuan-note/siyuan/issues/9856)

### 移除功能

Expand Down

0 comments on commit 94ffe16

Please sign in to comment.