Merge remote-tracking branch 'origin' into feature_html_on_s3
authorBryan <btbonval@gmail.com>
Fri, 17 Jan 2014 05:33:47 +0000 (00:33 -0500)
committerBryan <btbonval@gmail.com>
Fri, 17 Jan 2014 05:33:47 +0000 (00:33 -0500)
commit5319934e6c4e808a59deab3d0ef21253525f2b85
tree9d37fcc312c4ed7f499508dde212dd601c448045
parentd27b96ae375a443913b90c82a03d5b6d84c3b08f
parenta6f25f83617d463de16e4e9346f65d07ef06a619
Merge remote-tracking branch 'origin' into feature_html_on_s3
karmaworld/urls.py