Merge branch 'develop-1.2' into Release-1.2-V14

Browse Source

# Conflicts:
#	ActorPrefix.ftl
#	RFXtoRP_HsaDesPatch.ftl
#	RFXtoRP_HsaDespNt.ftl
#	RFXtoRP_HsrLoadInfo.ftl
#	RFXtoRP_HsrPackBranch.ftl
#	RFXtoRP_HsrPackOrder.ftl

...

This commit is contained in:

Francis REAT

2026-06-22 13:38:41 +02:00

parent 5e3633aaa1 a4b5a1dbf0

commit 89be22e1e1

6 changed files with 14 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files