From 496ecc720f488d10fbdfec4459741c3318b3ce58 Mon Sep 17 00:00:00 2001
From: Steven Gill <stevengill97@gmail.com>
Date: Wed, 4 Dec 2013 15:16:31 -0800
Subject: [PATCH] [CB-5565] Updated version and RELEASENOTES.md for release
 0.2.5

---
 RELEASENOTES.md | 8 +++++++-
 plugin.xml      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5ad2e29..3f7957d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -48,4 +48,10 @@
 * CB-3747 Fix back button having different dismiss logic from the close button.
 * CB-5021 Expose closeDialog() as a public function and make it safe to call multiple times.
 * CB-5021 Make it safe to call close() multiple times
->>>>>>> dev
+
+### 0.2.5 (Dec 4, 2013)
+* Remove merge conflict tag
+* [CB-4724] fixed UriFormatException
+* add ubuntu platform
+* CB-3420 WP feature hidden=yes implemented
+* Added amazon-fireos platform. Change to use amazon-fireos as the platform if user agent string contains 'cordova-amazon-fireos'
diff --git a/plugin.xml b/plugin.xml
index 8975a59..bb52218 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
-      version="0.2.5-dev">
+      version="0.2.5">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>