Commit 94232962 authored by Vincent's avatar Vincent

Merge branch 'master' of gitlab.appsmiles.eu:appsmiles-public/APMServices-SDK-iOS

# Conflicts:
#	APMServices.podspec
#	APMServices/Frameworks/APMServices.framework/Versions/A/APMServices
#	APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesConfig.h
parents 4c72f163 6338f5de
......@@ -33,3 +33,4 @@ Carthage
# `pod install` in .travis.yml
#
# Pods/
test-modify-master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment