Felix Mau b4c07042c1 Merge branch 'master' into feature/swift-4.2 ...

# Conflicts:
#	.swiftformat
#	Example/Podfile.lock
#	Example/Pods/Local Podspecs/GradientLoadingBar.podspec.json
#	Example/Pods/Manifest.lock
#	Example/Pods/Pods.xcodeproj/project.pbxproj
#	Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/GradientLoadingBar.xcscheme
#	Example/Pods/SwiftFormat/CommandLineTool/swiftformat
#	Example/Pods/SwiftFormat/README.md
#	Example/Pods/SwiftLint/swiftlint
#	Example/Pods/Target Support Files/GradientLoadingBar/GradientLoadingBar.xcconfig
#	Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example-acknowledgements.markdown
#	Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example-acknowledgements.plist
#	Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example-frameworks.sh
#	Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-GradientLoadingBar_Example/Pods-GradientLoadingBar_Example.release.xcconfig
#	Example/Pods/Target Support Files/Pods-GradientLoadingBar_Tests/Pods-GradientLoadingBar_Tests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-GradientLoadingBar_Tests/Pods-GradientLoadingBar_Tests.release.xcconfig
#	GradientLoadingBar/Classes/ViewModel/GradientLoadingBarViewModel.swift
#	Scripts/swift-format.sh

2018-08-19 12:56:54 +02:00

..

swiftlint

* remove pods

2018-08-19 12:43:52 +02:00