Daniel Metzing cf64c0873b Merge branch 'attibute_and_modifier_order' into upstream_master ...

# Conflicts:
#	Cartfile
#	Cartfile.private
#	Cartfile.resolved
#	Carthage/Checkouts/SourceKitten
#	Package.resolved
#	Package.swift
#	Rules.md
#	Source/SwiftLintFramework/Extensions/Configuration+LintableFiles.swift
#	Source/SwiftLintFramework/Extensions/Dictionary+SwiftLint.swift
#	Source/SwiftLintFramework/Models/SwiftVersion.swift
#	Source/SwiftLintFramework/Rules/ModifiersOrderRule.swift
#	Source/SwiftLintFramework/Rules/RuleConfigurations/ModifiersOrderConfiguration.swift
#	SwiftLint.xcodeproj/project.pbxproj
#	Tests/SwiftLintFrameworkTests/LinterCacheTests.swift
#	Tests/SwiftLintFrameworkTests/ModifiersOrderTests.swift
#	circle.yml

2018-04-10 23:04:11 +02:00

..

Extensions

Adding rule

2018-04-10 22:52:16 +02:00

Helpers

Don’t trigger violations for extensions in same file

2017-10-07 20:28:11 -03:00

Models

Merge branch 'attibute_and_modifier_order' into upstream_master

2018-04-10 23:04:11 +02:00

Protocols

'flatMap' is deprecated: renamed to 'compactMap(_:)'

2018-04-08 13:28:09 +09:00

Reporters

'flatMap' is deprecated: renamed to 'compactMap(_:)'

2018-04-08 13:28:09 +09:00

Rules

Merge branch 'attibute_and_modifier_order' into upstream_master

2018-04-10 23:04:11 +02:00

Supporting Files

release 0.25.1

2018-04-08 11:11:28 -07:00