Merge branch 'release/1.0.6'

uias · Apr 26, 2017 · cccd3ba · cccd3ba
2 parents 898375c + 060493b
commit cccd3ba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Pageboy.podspec b/Pageboy.podspec
@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "9.0"
   s.requires_arc = true
 
-  s.version      = "1.0.5"
+  s.version      = "1.0.6"
   s.summary      = "A simple, highly informative page view controller."
   s.description  = <<-DESC
   					A page view controller that provides simplified data source management, enhanced delegation and other useful features.

diff --git a/Sources/Pageboy/Info.plist b/Sources/Pageboy/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
 	<string>AUTO_GENERATED</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Pageboy/PageboyViewController.swift b/Sources/Pageboy/PageboyViewController.swift
@@ -251,8 +251,8 @@ open class PageboyViewController: UIViewController {
     // MARK: Lifecycle
     //
 
-    open override func loadView() {
-        super.loadView()
+    open override func viewDidLoad() {
+        super.viewDidLoad()
 
         self.autoScroller.handler = self
         self.setUpPageViewController()