From 818886cf676f9769be97947e230b218ce408bc54 Mon Sep 17 00:00:00 2001
From: Zak Groner <hey@zak.xyz>
Date: Tue, 21 Oct 2014 11:10:52 -0700
Subject: [PATCH] update version to 1.2.5

---
 README.md    | 4 ++--
 bower.json   | 2 +-
 package.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index dc8f74fd7..4f19dcc99 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ When storing user inputted text in your database, say from a guestbook or throug
 We've teamed up with [JSDelivr](http://jsdelivr.com) to provide a simple way to install these emoji on any javascript-enabled website. Add the following script and stylesheet links to the head of your webpage:
 
 ```
-<script src="//cdn.jsdelivr.net/emojione/1.2.4/lib/js/emojione.min.js"></script>
-<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/1.2.4/assets/css/emojione.min.css"/>
+<script src="//cdn.jsdelivr.net/emojione/1.2.5/lib/js/emojione.min.js"></script>
+<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/1.2.5/assets/css/emojione.min.css"/>
 ```
 
 Quick installs can also be done using NPM and Bower (for the Javascript toolkit) or Composer (for the PHP toolkit).
diff --git a/bower.json b/bower.json
index fdd1dc1dc..d9a917e7d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "main:": [
     "assets/css/emojione.css",
     "lib/js/emojione.js"
diff --git a/package.json b/package.json
index 19e985a26..97219efd2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "emojione",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "description": "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images.",
     "author": "Emoji One <ryan@emojione.com> (http://emojione.com)",
     "main": "lib/js/emojione.js",