Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
popeyelau committed May 5, 2019
2 parents 8ea1955 + 1cd87a5 commit 7a31eb4
Show file tree
Hide file tree
Showing 77 changed files with 1,436 additions and 591 deletions.
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PODS:
- Alamofire (4.8.2)
- Kingfisher (5.3.1)
- Kingfisher (5.4.0)
- PromiseKit/Alamofire (6.8.4):
- Alamofire (~> 4.0)
- PromiseKit/CorePromise
- PromiseKit/CorePromise (6.8.4)
- SnapKit (4.2.0)
- SnapKit (5.0.0)
- SQLiteRepairKit (1.2.2):
- WCDBOptimizedSQLCipher (~> 1.2.0)
- WCDB.swift (1.0.8.2):
Expand All @@ -31,9 +31,9 @@ SPEC REPOS:

SPEC CHECKSUMS:
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
Kingfisher: d9e7e0b209b59b8f9873aa2f37654e81a7beea51
Kingfisher: 9c8f2cc6710334e06f32ba2b45e77707d5e2f0c9
PromiseKit: 51794a832647e7b819336dc2279039ce9f1cc49b
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
SQLiteRepairKit: 35aaae5a8838adb85f5b1eb4d796055be6060a4b
WCDB.swift: 05d509d7a0e60fb6e11c34eb7e4027c0fab5849f
WCDBOptimizedSQLCipher: baf44493b0c7a3d49e97bc5b64a3856f6428ddd1
Expand Down
2 changes: 2 additions & 0 deletions Pods/Kingfisher/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/Kingfisher/Sources/General/Deprecated.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 54 additions & 5 deletions Pods/Kingfisher/Sources/Image/Image.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Pods/Kingfisher/Sources/Image/ImageDrawing.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/Kingfisher/Sources/Utility/String+MD5.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7a31eb4

Please sign in to comment.