Merge branch 'licard-dev' of https://git.svc.touchin.ru/TouchInstinct/BuildScripts into merge_master_in_licard_dev

Browse Source

 Conflicts:

	gradle/apiGenerator.gradle

	gradle/apiGeneratorKotlinServer.gradle

	gradle/commonStaticAnalysis.gradle

	xcode/build_phases/api_generator.sh

...

This commit is contained in:

Bogdan Terehov 2023-09-04 19:04:40 +03:00

parent 504f2c273d d2f03ee79f

commit 30bc5fb038

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

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

Diff Content Not Available