Merge branch 'release/1.0.2'

joypixels · May 20, 2015 · 0beea81 · 0beea81
2 parents 17f79be + f08823b
commit 0beea81
Show file tree

Hide file tree

Showing 16 changed files with 1,570 additions and 1,552 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,12 @@
 language: node_js
 node_js:
   - "0.10"
-before_install: npm install -g grunt-cli
+  - "0.11"
+  - iojs
+
+matrix:
+  allow_failures:
+    - node_js: "0.11"
+    - node_js: "iojs"
+
+before_install: npm install -g gulp
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "emojify.js",
   "main": "dist/js/emojify.js",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "homepage": "https://github.com/hassankhan/emojify.js",
   "authors": [
     "Hassan Khan (hassankhan)"

diff --git a/dist/css/data-uri/emojify-emoticons.css b/dist/css/data-uri/emojify-emoticons.css
diff --git a/dist/css/data-uri/emojify-emoticons.min.css b/dist/css/data-uri/emojify-emoticons.min.css
diff --git a/dist/css/data-uri/emojify.css b/dist/css/data-uri/emojify.css
diff --git a/dist/css/data-uri/emojify.min.css b/dist/css/data-uri/emojify.min.css