diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-26 13:18:26 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-26 13:18:26 -0400 |
| commit | 593fb6005cef063f9f35af8a4a71f4ec96654583 (patch) | |
| tree | 15de8490c453b6068fc10d7acfc19dfc132fe9c7 /settings.py | |
| parent | da2751757bc8b6638b6dd6af35d961f05957a105 (diff) | |
| parent | 943ef2e8e436a32ce5dc956c4d855866cd644cc1 (diff) | |
Merge commit '943ef2e8e4'
Conflicts:
public/static/logos/legacy/arch-legacy-aqua-blue.png
public/static/logos/legacy/arch-legacy-aqua-blue.svg
public/static/logos/legacy/arch-legacy-aqua-white.png
public/static/logos/legacy/arch-legacy-aqua-white.svg
public/static/logos/legacy/arch-legacy-aqua.png
public/static/logos/legacy/arch-legacy-aqua.svg
public/static/logos/legacy/arch-legacy-blue1.png
public/static/logos/legacy/arch-legacy-blue1.svg
public/static/logos/legacy/arch-legacy-blue2.png
public/static/logos/legacy/arch-legacy-blue2.svg
public/static/logos/legacy/arch-legacy-noodle-blue.png
public/static/logos/legacy/arch-legacy-noodle-blue.svg
public/static/logos/legacy/arch-legacy-noodle-box.png
public/static/logos/legacy/arch-legacy-noodle-box.svg
public/static/logos/legacy/arch-legacy-noodle-cup.png
public/static/logos/legacy/arch-legacy-noodle-cup.svg
public/static/logos/legacy/arch-legacy-noodle-white.png
public/static/logos/legacy/arch-legacy-noodle-white.svg
public/static/logos/legacy/arch-legacy-ribbon1.png
public/static/logos/legacy/arch-legacy-ribbon2.png
public/static/logos/legacy/arch-legacy-ribbon3.png
public/static/logos/legacy/arch-legacy-ribbon4.png
public/static/logos/legacy/arch-legacy-ribbon5.png
public/static/logos/legacy/arch-legacy-ribbon6.png
public/static/logos/legacy/arch-legacy-wombat-lg.png
public/static/logos/legacy/arch-legacy-wombat.png
sitestatic/favicon.ico
sitestatic/jquery-1.4.4.min.js
sitestatic/jquery.tablesorter.min.js
sitestatic/silhouette.png
templates/base.html
templates/devel/clock.html
templates/packages/opensearch.xml
visualize/static/d3.geom.min.js
visualize/static/d3.layout.min.js
visualize/static/d3.min.js
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/settings.py b/settings.py index 362c100b..f7524d93 100644 --- a/settings.py +++ b/settings.py @@ -118,11 +118,15 @@ INSTALLED_APPS = ( 'devel', 'public', 'releng', + 'visualize', ) ## Server used for linking to PGP keysearch results PGP_SERVER = 'pgp.mit.edu:11371' +# URL to fetch a current list of available ISOs +ISO_LIST_URL = 'https://repo.parabolagnulinux.org/isos/' + ## Import local settings from local_settings import * @@ -140,7 +144,4 @@ if DEBUG_TOOLBAR: INSTALLED_APPS = list(INSTALLED_APPS) + [ 'debug_toolbar' ] -# URL to fetch a current list of available ISOs -ISO_LIST_URL = 'https://repo.parabolagnulinux.org/isos/' - # vim: set ts=4 sw=4 et: |