Skip to content

Commit

Permalink
Merge branch 'cam1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mr-fixit committed Sep 18, 2020
2 parents 13af951 + 9f35b74 commit e1dc4ab
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 16 deletions.
12 changes: 0 additions & 12 deletions .gitmodules

This file was deleted.

10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

Changes for users of the library currently on `develop`:

## [5.0.4](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.4)
## [5.0.5](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.5)

Changes for users of the library in 5.0.4:
Changes for users of the library in 5.0.5:

- Update PINRemoteImage to 3.0.1 for Xcode 12
- Restored the ability to pull down via Carthage

## [5.0.4 (broken)](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.4)

- Broke the ability to pull down via Carthage or build this repo in Xcode!
- Update PINRemoteImage to 3.0.1 for Xcode 12

## [5.0.3](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.3)
Expand Down
2 changes: 1 addition & 1 deletion NYTPhotoViewer.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "NYTPhotoViewer"
s.version = "5.0.4"
s.version = "5.0.5"

s.description = <<-DESC
NYTPhotoViewer is a slideshow and image viewer that includes double tap to zoom, captions, support for multiple images, interactive flick to dismiss, animated zooming presentation, and more.
Expand Down
2 changes: 1 addition & 1 deletion NYTPhotoViewer/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>5.0.4</string>
<string>5.0.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit e1dc4ab

Please sign in to comment.