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
This commit is contained in:
Felix Mau
2018-09-22 14:38:48 +02:00
4 changed files with 8 additions and 2 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
private func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
// Customize shared instance of `GradientLoadingBar`