Merge branch 'cherry-pick-c3ce0b2c' into 'newbranch-api-test-4'

Merge branch 'main' into 'main' See merge request appsketch-works/app-test!10
Merge branch 'main' into 'main'
2024-09-19 06:26:00 +00:00 · 2024-09-19 06:25:14 +00:00 · 2024-09-14 02:19:13 +00:00
2 changed files with 2 additions and 1 deletions
--- a/applications/api/app-test.json
+++ b/applications/api/app-test.json
@@ -0,0 +1 @@
+{'key':'value'}
--- a/applications/api/app.json
+++ b/applications/api/app.json
@@ -1 +1 @@
-{'key':'value'}
+{'key':'val'}
Author	SHA1	Message	Date
方顺健	fa8c84da2c	Merge branch 'cherry-pick-c3ce0b2c' into 'newbranch-api-test-4' Merge branch 'main' into 'main' See merge request appsketch-works/app-test!10	2024-09-19 06:26:00 +00:00
方顺健	81dd3d9130	Merge branch 'main' into 'main' modify value See merge request appsketch-works/app-test!9 (cherry picked from commit `c3ce0b2cbd`) `e1ca74f9` modify value Co-authored-by: 方顺健 <fangshunjian@geedgenetworks.com>	2024-09-19 06:25:14 +00:00
fangshunjian	3f1798f923	commit from gitlab api user userToken	2024-09-14 02:19:13 +00:00