diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 19:10:27 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 19:10:27 -0500 |
commit | bcf8f7438278880f092361814bbcd3207d11e937 (patch) | |
tree | c9b83fb0770dd17f352673c3ff13b8b13b09a180 /templates/devel/clock.html | |
parent | 02fdb37d55ec1158162d4c35c3b43d1bcd4e58fa (diff) | |
parent | 024fd1b2843d2abd0094faedfbc49e1d1a21edd0 (diff) |
Merge commit '024fd1b' (Remove cdnprefix template tag)
Conflicts:
templates/base.html
templates/public/art.html
templates/public/donate.html
templates/public/download.html
templates/public/index.html
Diffstat (limited to 'templates/devel/clock.html')
0 files changed, 0 insertions, 0 deletions