Merge remote-tracking branch 'origin/master'

WyriHaximus · WyriHaximus · commit 78976c0f1e0d · 2016-12-21T17:49:39.000+01:00
diff --git a/examples/emoji.php b/examples/emoji.php
@@ -47,4 +47,5 @@
     '🔊',
     '🎵',
     '🎶',
+    '🖖 ',
 ];

-Original file line number
+Diff line change
     '🔊',
     '🎵',
     '🎶',
 +    '🖖 ',
 ];