Felix Mau de48aaff40 Merge branch 'master' into feature/observables ...

# Conflicts:
#	Example/GradientLoadingBar.xcodeproj/project.pbxproj
#	Example/GradientLoadingBar/AppDelegate.swift
#	Example/Podfile.lock
#	GradientLoadingBar/Classes/ViewModel/GradientLoadingBarViewModel.swift
#	GradientLoadingBar/Classes/Views/GradientView.swift

2018-09-22 14:38:48 +02:00

..

project.xcworkspace

* refactored project structure to match "pod lib create"

2017-10-01 12:25:42 +02:00

xcshareddata/xcschemes

* updated recommend settings

2018-06-09 10:25:34 +02:00

project.pbxproj

Merge branch 'master' into feature/observables

2018-09-22 14:38:48 +02:00