Merge branch 'release/3.0.0'

connorpower · Feb 2, 2018 · 8aafc8e · 8aafc8e
2 parents bdc2849 + a8881ff
commit 8aafc8e
Show file tree

Hide file tree

Showing 87 changed files with 70 additions and 12,120 deletions.
diff --git a/.gitignore b/.gitignore
@@ -95,3 +95,4 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 
+Package.resolved
diff --git a/.swift-version b/.swift-version
diff --git a/Cartfile b/Cartfile
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
diff --git a/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Example/Example.xcworkspace/contents.xcworkspacedata b/Example/Example.xcworkspace/contents.xcworkspacedata
diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift
diff --git a/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -95,3 +95,4 @@ fastlane/Preview.html
		fastlane/screenshots
		fastlane/test_output

		Package.resolved