gewuyou fe32898fef Merge branch 'release-v1.1.13' of https://gitee.com/jcnc-org/JNotepad into develop
# Conflicts:
#	src/main/java/org/jcnc/jnotepad/component/stage/setting/DeveloperDebugStage.java
#	src/main/java/org/jcnc/jnotepad/component/stage/setting/SetStage.java
#	src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java
#	src/main/resources/i18n/i18n.properties
2023-10-05 22:39:12 +08:00
..