Merge pull request #6 from appium/rebase_on_upstream

Rebase on upstream
appium-boneyard · Oct 13, 2015 · 15e41ac · 15e41ac
2 parents 45c172a + 9f5f420
commit 15e41ac
Show file tree

Hide file tree

Showing 5 changed files with 484 additions and 46 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<platform.version>2.3.3</platform.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<selenium.version>2.45.0</selenium.version>
+		<selenium.version>2.48.0</selenium.version>
 		<apache-httpclient.version>4.3.4</apache-httpclient.version>
 	</properties>
 	<url>http://selendroid.io</url>