1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge remote-tracking branch 'zetok/fix-emoticon'

This commit is contained in:
agilob 2015-10-08 18:55:51 +01:00
commit de9aba2734
No known key found for this signature in database
GPG Key ID: 296F0B764741106C

View File

@ -24,7 +24,6 @@
</emoticon>
<emoticon file="1f604">
<string>😄</string>
<string>^_^</string>
<string>:happy:</string>
</emoticon>
<emoticon file="1f605">