Commit 299df1d
committed
Merge branch 'master' of github.com:insanoid/SwiftyJSONAccelerator into swift-5
# Conflicts:
# .swiftlint.yml
# Core/Generators/NameGenerator.swift
# Core/Helpers/String+Helpers.swift
# Gemfile
# Gemfile.lock
# README.md
# SwiftyJSONAccelerator.xcodeproj/project.pbxproj
# SwiftyJSONAccelerator/External-Libraries/LineNumberRulerView.swift
# SwiftyJSONAccelerator/Storyboard/Main.storyboard
# SwiftyJSONAccelerator/UI/SJEditorViewController.swift
# SwiftyJSONAccelerator/UI/SJTextView.swift0 file changed
0 commit comments