You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Yvan
337a465932
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
# Conflicts:
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
|
4 years ago |
.. |
src/main/resources/com/fr/design/i18n
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
4 years ago |
pom.xml
|
无JIRA任务 所有的代码间依赖全写成 10.0,对jar的依赖全写成#{branch}
|
6 years ago |