Merge remote-tracking branch 'origin/master'

joypixels · Sep 10, 2014 · ca5cb44 · ca5cb44
2 parents 929f593 + a2e3cef
commit ca5cb44
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 41 deletions.
diff --git a/lib/js/emojione.js b/lib/js/emojione.js