Merge branch 'master' into develop

# Conflicts: # README.md
mac-cain13 · Aug 11, 2015 · d877c03 · d877c03
2 parents 1a73043 + 034c400
commit d877c03
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/R.swift.podspec b/R.swift.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "R.swift"
-  s.version      = "0.8.4"
+  s.version      = "0.8.5"
   s.summary      = "Use strong typed, autocompleted resources like images and segues in Swift"
 
   s.description  = <<-DESC
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, "7.0"
 
-  s.source       = { :http => "https://github.com/mac-cain13/R.swift/releases/download/v0.8.4/rswift-0.8.4.zip" }
+  s.source       = { :http => "https://github.com/mac-cain13/R.swift/releases/download/v0.8.5/rswift-0.8.5.zip" }
 
   s.preserve_paths = "rswift"