CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Joshua Simmons 2017-08-08 20:34:54 -07:00
commit 28581b5eeb
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pinaxcon/settings.py
View file

@ -143,6 +143,7 @@ INSTALLED_APPS = [
"pinax.boxes", "pinax.boxes",
"pinax.eventlog", "pinax.eventlog",
"pinax.pages", "pinax.pages",
"markdown_deux",
# symposion # symposion
"symposion", "symposion",

3
requirements.txt
View file

@ -8,6 +8,9 @@ dj-database-url==0.4.0
pinax-pages==0.4.2 pinax-pages==0.4.2
pinax-boxes==2.1.2 pinax-boxes==2.1.2
django-libsass==0.7 django-libsass==0.7
django-markdown-deux==1.0.5
# For testing # For testing
django-nose==1.4.3 django-nose==1.4.3