Merge pull request #788 from JohnCoates/feature/1.5.0

Feature/1.5.0
JohnCoates · May 29, 2019 · cc51c54 · cc51c54
2 parents 7fa47a0 + 73c20d0
commit cc51c54
Show file tree

Hide file tree

Showing 23 changed files with 2,743 additions and 170 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -14,6 +14,7 @@ disabled_rules:
   - function_body_length
   # Allow declaring operators without extra whitespace, like so: `func ==(_ lhs, ...)`
   - operator_whitespace
+  - redundant_string_enum_value
 
 opt_in_rules:
   # Prefer checking `isEmpty` over `count > 0`

diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
diff --git a/Aerial/App/Resources/Info.plist b/Aerial/App/Resources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.7beta6</string>
+	<string>1.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>