Merge remote-tracking branch 'origin/ft/JD-206/expose-thrift-port' into ft/JD-206/expose-thrift-port

Browse Source

# Conflicts:
#	pom.xml
#	src/main/java/com/rbkmoney/orgmanager/config/TomcatWebServerCustomizer.java
#	src/main/resources/application.yml

...

This commit is contained in:

Elena Kushchenko 2021-07-13 16:22:38 +03:00

parent d704adfe72 7bcdb49268

commit 9a60bd7857

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