Skip to content

Commit c29f2cb

Browse files
Merge branch 'release/1.1.6'
2 parents 05cea06 + 4c3b9ea commit c29f2cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+173
-5188
lines changed

.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,24 @@ xcuserdata
8686
# you should judge for yourself, the pros and cons are mentioned at:
8787
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
8888

89-
# Pods/
90-
# Podfile.lock
89+
Pods/
90+
Podfile.lock
9191

9292
# Carthage
9393
#
9494
# Add this line if you want to avoid checking in source code from Carthage dependencies.
95-
# Carthage/Checkouts
9695

97-
# Carthage/Build
96+
Carthage/Checkouts
97+
Carthage/Build
9898

9999
# fastlane
100100
#
101-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
101+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
102102
# screenshots whenever they are needed.
103103
# For more information about the recommended setup visit:
104104
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
105105

106+
fastlane/README.md
106107
fastlane/report.xml
107108
# fastlane/screenshots
108109

Carthage/Checkouts/ProjectGenerator/.gitignore

Lines changed: 0 additions & 167 deletions
This file was deleted.

Carthage/Checkouts/ProjectGenerator/Example/Spec.swift

Lines changed: 0 additions & 99 deletions
This file was deleted.

Carthage/Checkouts/ProjectGenerator/Info/Fwk.plist

Lines changed: 0 additions & 26 deletions
This file was deleted.

Carthage/Checkouts/ProjectGenerator/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

Carthage/Checkouts/ProjectGenerator/Launcher/main.swift

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)