Merge pull request #109 from BenjaminPalko/master

Django 3.0 staticfiles removal fix

Author: agusmakmun

martor/extensions/emoji.py

@@ -1,8 +1,12 @@
 import markdown
-from ..settings import (
-    MARTOR_MARKDOWN_BASE_EMOJI_URL,
-    MARTOR_MARKDOWN_BASE_EMOJI_USE_STATIC)
-from django.templatetags import static
+
+try:
+    from django.contrib.staticfiles.templatetags.staticfiles import static
+except ModuleNotFoundError:
+    from django.templatetags.static import static
+
+from ..settings import (MARTOR_MARKDOWN_BASE_EMOJI_URL,
+                        MARTOR_MARKDOWN_BASE_EMOJI_USE_STATIC)
 
 """
 >>> import markdown