Unicode 7.0 update

joypixels · Jul 17, 2015 · 4e995d8 · 4e995d8
1 parent 417b3ac
commit 4e995d8
Show file tree

Hide file tree

Showing 10 changed files with 1,024 additions and 234 deletions.
diff --git 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://www.jsdelivr.com/#!emojione) 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.4.1/lib/js/emojione.min.js"></script>
-<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/1.4.1/assets/css/emojione.min.css"/>
+<script src="//cdn.jsdelivr.net/emojione/1.5.0/lib/js/emojione.min.js"></script>
+<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/1.5.0/assets/css/emojione.min.css"/>
 ```
 
 Alternatively, CDNjs is also available as a [CDN Host for Emoji One](https://cdnjs.com/libraries/emojione).

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "main:": [
     "assets/css/emojione.css",
     "lib/js/emojione.js"

diff --git a/emoji.json b/emoji.json
diff --git a/emoji_strategy.json b/emoji_strategy.json
diff --git a/lib/js/emojione.js b/lib/js/emojione.js
diff --git a/lib/js/emojione.min.js b/lib/js/emojione.min.js