Merge branch 'master' into development · veritrans/Veritrans-ios-sdk@0104c5b · GitHub

Commit

Merge branch 'master' into development

Browse files

# Conflicts:
#	MidtransCoreKit/MidtransCoreKit.xcodeproj/project.pbxproj
#	MidtransDemo/MidtransDemo/Info.plist
#	MidtransDemo/MidtransDemo/MDOrderViewController.m
#	MidtransDemo/MidtransDemo/MDProductViewController.m
#	Podpecs/MidtransCoreKit.podspec
#	Podpecs/MidtransKit.podspec

Loading branch information

Nanang Rafsanjani committed Nov 5, 2018

2 parents 53718dc + 414be5a commit 0104c5b