durian
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dev_bei->test_forge #1

Closed
durian wants to merge 423 commits from dev_bei into test_forge
pull from: dev_bei
merge into: durian:test_forge
Conversation 0 Commits 423 Files Changed 411 +20084 -53453
durian commented 2021-10-14 16:35:57 +08:00
Owner
Copy Link

dev_bei->test_forge

dev_bei->test_forge
durian added 423 commits 2021-10-14 16:35:58 +08:00
2f1bac24d5 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/Detail.js
15d3102c51 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/CoderRootDirectory.js
15bd20122a Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Images/banner_list_old.png
#	src/forge/Main/list.css
8cee70c195 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	public/css/iconfont.css
#	public/css/iconfont.eot
#	public/css/iconfont.js
#	public/css/iconfont.json
#	public/css/iconfont.svg
#	public/css/iconfont.ttf
#	public/css/iconfont.woff
#	public/css/iconfont.woff2
b6dfe2cd4a Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/Detail.js
62b99c7921 Merge branch 'dev_chain' of https://git.trustie.net/jasder/forgeplus-react into dev_devOps 
# Conflicts:
#	src/forge/Merge/UpdateMerge.js
#	src/forge/Order/Detail.js
#	src/forge/Order/OrderItem.js
#	src/forge/Order/order_form.js
durian closed this pull request 2021-10-14 16:36:45 +08:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: durian/forgeplus-react#1
No description provided.
Delete Branch "dev_bei"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?