Merge remote-tracking branch 'origin/master' into josh/copy

2017-08-08 20:34:54 -07:00 · 2017-08-08 20:34:54 -07:00 · 28581b5eeb
commit 28581b5eeb
parent 077beca34d c3c23f7129
2 changed files with 4 additions and 0 deletions
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@ -143,6 +143,7 @@ INSTALLED_APPS = [
    "pinax.boxes",
    "pinax.eventlog",
    "pinax.pages",
+    "markdown_deux",

    # symposion
    "symposion",
--- a/requirements.txt
+++ b/requirements.txt
@ -8,6 +8,9 @@ dj-database-url==0.4.0
 pinax-pages==0.4.2
 pinax-boxes==2.1.2
 django-libsass==0.7
+django-markdown-deux==1.0.5
+
+

 # For testing
 django-nose==1.4.3