Merge remote-tracking branch 'upstream/main' into instance-setting2

Glavo · Glavo · commit 46f3bbb693e9 · 2026-05-25T20:18:26.000+08:00
diff --git a/config/project.properties b/config/project.properties
@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
-versionRoot=3.14
+versionRoot=3.15

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`# You should have received a copy of the GNU General Public License`
`16`	`16`	`# along with this program. If not, see <https://www.gnu.org/licenses/>.`
`17`	`17`	`#`
`18`		`-versionRoot=3.14`
	`18`	`+versionRoot=3.15`