Merge branch 'master' into develop

calabash · Oct 23, 2014 · 8d7b7ac · 8d7b7ac
2 parents c1abb7a + e1821ad
commit 8d7b7ac
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/calabash/Classes/FranklyServer/Routes/LPVersionRoute.h b/calabash/Classes/FranklyServer/Routes/LPVersionRoute.h
@@ -21,7 +21,7 @@
  Do not change the 'CALABASH VERSION' portion of the following constant without
  updating the ruby API.
  ******************/
-#define kLPCALABASHVERSION @"CALABASH VERSION: 0.11.1"
+#define kLPCALABASHVERSION @"CALABASH VERSION: 0.11.2"
 
 @interface LPVersionRoute : NSObject <LPRoute>