Skip to content

Commit 93e3a39

Browse files
author
Amir Shavit
committed
Merge remote-tracking branch 'origin/mask_animation' into develop
* origin/mask_animation: Remove missing files from ignore list pod install Revert "local pod update"
2 parents 8d4d14d + 4f4e7ad commit 93e3a39

18 files changed

+1846
-8424
lines changed

‎Example/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ EXTERNAL SOURCES:
1616

1717
SPEC CHECKSUMS:
1818
Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024
19-
JazzHands: 4d38fdda8958cd3d994c9b53cf3cdda0ae272bc0
19+
JazzHands: 0f3c8578f33f45b2fe73975deed6a5f02f9c22d3
2020
Masonry: 4972309f2f134de9dd312f4dc4a21359b50e6caa
2121
Specta: 9cec98310dca411f7c7ffd6943552b501622abfe
2222

23-
COCOAPODS: 0.35.0
23+
COCOAPODS: 0.38.0

‎Example/Pods/Headers/Private/JazzHands/IFTTTMaskAnimation.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Headers/Private/Masonry/ViewController+MASAdditions.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Headers/Public/JazzHands/IFTTTMaskAnimation.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Headers/Public/Masonry/ViewController+MASAdditions.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Manifest.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Masonry/Masonry/ViewController+MASAdditions.h

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Masonry/Masonry/ViewController+MASAdditions.m

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)