CopyleftConf/copyleftconf-website Changeset - 28581b5eeb3a

Changeset - 28581b5eeb3a

Parent rev.

Child rev.

[Not reviewed]

Merge

0 3 0

Joshua Simmons - 7 years ago 2017-08-09 03:34:54
i@joshuasimmons.name

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

2 files changed with 4 insertions and 0 deletions:

pinaxcon/settings.py

requirements.txt

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -142,8 +142,9 @@ INSTALLED_APPS = [ @@
     "sitetree",
     "pinax.boxes",
     "pinax.eventlog",
     "pinax.pages",
     "markdown_deux",
     # symposion
     "symposion",
     "symposion.conference",

requirements.txt

➞

Show inline comments

@@ ... / @@ -7,8 +7,11 @@ dj-static==0.0.6 @@
 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
 coverage==4.0.3

0 comments (0 inline, 0 general)