Merge branch 'hotfix' into develop

Browse Source

# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java

master

kira 7 years ago

parent eb4ffa947d 5251d2fde3

commit 17b3f99880

1 changed files with 1 additions and 1 deletions

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

Write Preview

Loading…

Cancel

Save