Merge branch 'master' into 'test-settings-view'

# Conflicts:
#   Screenshottr.xcodeproj/project.pbxproj
#   Screenshottr/PomfManager.swift

Screenshottr.xcodeproj/project.pbxproj

@@ -336,7 +336,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Screenshottr/Pods-Screenshottr-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Screenshottr/Pods-Screenshottr-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/SKQueue/SKQueue.framework",
 			);
@@ -347,7 +347,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Screenshottr/Pods-Screenshottr-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Screenshottr/Pods-Screenshottr-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		5A8E306794788F5AFD30748E /* [CP] Check Pods Manifest.lock */ = {

Screenshottr.xcodeproj/xcshareddata/xcschemes/Screenshottr.xcscheme

+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4279D57F1F4686AB00558889"
+               BuildableName = "Screenshottr.app"
+               BlueprintName = "Screenshottr"
+               ReferencedContainer = "container:Screenshottr.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4279D57F1F4686AB00558889"
+            BuildableName = "Screenshottr.app"
+            BlueprintName = "Screenshottr"
+            ReferencedContainer = "container:Screenshottr.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4279D57F1F4686AB00558889"
+            BuildableName = "Screenshottr.app"
+            BlueprintName = "Screenshottr"
+            ReferencedContainer = "container:Screenshottr.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4279D57F1F4686AB00558889"
+            BuildableName = "Screenshottr.app"
+            BlueprintName = "Screenshottr"
+            ReferencedContainer = "container:Screenshottr.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Screenshottr/PomfManager.swift

@@ -66,7 +66,7 @@ class PomfManager {
                     }
                 case let .failure(encodingError):
                     print(encodingError)
-                    completionHandler(encodingError, "https://google.com/")
+                    completionHandler(encodingError, "https://whats-th.is")
                 }
             }
         )