Merge branch 'master' of github.com:chrys87/fenrir

2016-10-13 00:11:40 +02:00
parent f6912ce14a 78cc1a76e5
commit 26ab1701d2
2 changed files with 8 additions and 1 deletions
--- a/src/fenrir/core/punctuationManager.py
+++ b/src/fenrir/core/punctuationManager.py
@ -59,7 +59,14 @@ class punctuationManager():
          '=':'equals',
          },
        'customDict':{
+          '>:)':'evil smiley',
+          '>:-)':'evil smiley',
+          '>:)}':'evil beerded smiley',
+          '>:-)}':'evil beerded smiley',
          ':)':'smiley',
+          ':-)':'smiley',
+          ':)}':'beerded smiley',
+          ':-)}':'beerded smiley',
          ';)':'winking face',
          'XD':'loool',
          ':@':'angry face',