merge:同步代码 解决冲突

This commit is contained in:
jzxc95 2023-09-28 14:08:21 +08:00
commit 71741d538b
1 changed files with 10 additions and 0 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
kylin-nm (3.24.0.0-0k2.21) v101; urgency=medium
* BUG:
- #194718 【网络连接】麒麟网络设置工具可固定到任务栏
* 需求号:无
* 其他改动说明: 弹窗跳过任务栏
* 其他改动影响域:单例
-- zhaoshixu <zhaoshixu@kylinos.cn> Thu, 28 Sep 2023 09:41:09 +0800
kylin-nm (3.24.0.0-0k2.20) v101; urgency=medium kylin-nm (3.24.0.0-0k2.20) v101; urgency=medium
* BUG: * BUG: