diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:31:43 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:31:43 -0500 |
| commit | ce8338cdc419a63afa105d239fc3ca60870e6125 (patch) | |
| tree | 356427b8da1ab024ac18ef2ca8254a2a9f63a6e7 /settings.py | |
| parent | e32f40db184d892540d6dd711e02912aead8d2b8 (diff) | |
| parent | 14c51a5bd86384510071829ba0b0cfb515e924e5 (diff) | |
Merge commit '14c51a5' (Update to d3 2.8.1)parabolaweb-2012-11-15
is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions