Merge branch 'master' into patch-2

2017-02-28 10:40:59 +02:00 · 2017-02-28 10:40:59 +02:00 · f35e867358
parent b200229b26 770eae466e
commit f35e867358
1 changed files with 1 additions and 0 deletions
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -218,5 +218,6 @@
    "Profi",
    "Abra",
    "Gaben"
+    "Technical"
  ]
 }