Skip to content

Commit

Permalink
Merge branch 'master' of github.com:airbnb/lottie-ios
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon Withrow committed Jan 28, 2017
2 parents 2dbceb8 + a056427 commit 8cc2386
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ LottieExamples.xcworkspace/xcuserdata/
Lottie/Lottie.xcodeproj/xcuserdata/
UserInterfaceState.xcuserstate
xample/lottie-ios.xcodeproj/xcuserdata
Lottie.xcodeproj/xcuserdata/
Lottie.xcodeproj/xcuserdata/
Example/lottie-ios.xcworkspace/xcuserdata/

0 comments on commit 8cc2386

Please sign in to comment.