Merge branch 'richardoti-master'

slackhq · Feb 16, 2016 · e2ca727 · e2ca727
2 parents 3f76402 + 81e972e
commit e2ca727
Show file tree

Hide file tree

Showing 13 changed files with 285 additions and 391 deletions.
diff --git a/Examples/Messenger.xcodeproj/project.pbxproj b/Examples/Messenger.xcodeproj/project.pbxproj
@@ -347,7 +347,6 @@
 				4F3EDB46199ED00F004C15D6 /* Frameworks */,
 				4F3EDB47199ED00F004C15D6 /* Resources */,
 				598FDC5936E74A05A38CC639 /* Copy Pods Resources */,
-				C2EB646D4848767495734371 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -591,21 +590,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C2EB646D4848767495734371 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		CDD847F204B5437180FB97BB /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/Examples/Podfile.lock b/Examples/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - LoremIpsum (1.0.0)
-  - SlackTextViewController (1.7)
+  - SlackTextViewController (1.9)
 
 DEPENDENCIES:
   - LoremIpsum (~> 1.0)
@@ -12,6 +12,6 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   LoremIpsum: 9029c55d36501b2ee0b05cc9ecda11d3a0479160
-  SlackTextViewController: 57e28248dd38b9753277733544449519842f1ea5
+  SlackTextViewController: d51503f7be846cb9976a273499dc90f2445e9447
 
-COCOAPODS: 0.39.0
+COCOAPODS: 0.38.2
diff --git a/Examples/Pods/Local Podspecs/SlackTextViewController.podspec.json b/Examples/Pods/Local Podspecs/SlackTextViewController.podspec.json
diff --git a/Examples/Pods/Manifest.lock b/Examples/Pods/Manifest.lock
diff --git a/Examples/Pods/Pods.xcodeproj/project.pbxproj b/Examples/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Examples/Pods/Target Support Files/LoremIpsum/LoremIpsum-Private.xcconfig b/Examples/Pods/Target Support Files/LoremIpsum/LoremIpsum-Private.xcconfig
diff --git a/Examples/Pods/Target Support Files/LoremIpsum/LoremIpsum.xcconfig b/Examples/Pods/Target Support Files/LoremIpsum/LoremIpsum.xcconfig
diff --git a/Examples/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/Examples/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
diff --git a/Examples/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/Examples/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
diff --git a/Examples/Pods/Target Support Files/Pods/Pods-frameworks.sh b/Examples/Pods/Target Support Files/Pods/Pods-frameworks.sh
diff --git a/Examples/Pods/Target Support Files/Pods/Pods-resources.sh b/Examples/Pods/Target Support Files/Pods/Pods-resources.sh
diff --git a/...ods/Target Support Files/SlackTextViewController/SlackTextViewController-Private.xcconfig b/...ods/Target Support Files/SlackTextViewController/SlackTextViewController-Private.xcconfig
diff --git a/Examples/Pods/Target Support Files/SlackTextViewController/SlackTextViewController.xcconfig b/Examples/Pods/Target Support Files/SlackTextViewController/SlackTextViewController.xcconfig