Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	Supporting/cocoapods/.swift-version
#	Supporting/cocoapods/Closures.podspec.json
#	Xcode/Closures.xcodeproj/project.pbxproj
#	Xcode/Closures.xcodeproj/xcshareddata/xcschemes/Closures.xcscheme
  • Loading branch information
vhesener committed Sep 21, 2019
1 parent 787e14b commit d42d1ce
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions Closures.podspec.json

This file was deleted.

0 comments on commit d42d1ce

Please sign in to comment.