Merge branch 'uhhh' of git://github.com/OliverUv/irssi-emojis into Ol…

…iverUv-uhhh Conflicts: emojis-db.dat
mrdaemon · Jun 6, 2013 · 87e4dba · 87e4dba
2 parents c7ea41a + 5ae1602
commit 87e4dba
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/emojis-db.dat b/emojis-db.dat
@@ -246,3 +246,7 @@ http://i.imgur.com/luDSI.gif
 (っ' ▽' )ノ
 :themoreyouknow:
 -===☆ ＴＨＥ  ＭＯＲＥ  ＹＯＵ  ＫＮＯＷ
+:party:
+ヽ( ˃ ヮ ˂)ノ ヽ(´▽｀*)ゞ ヽ(*´▽｀)ツ♪
+:rave:
+\(°▽、°)ノ