projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d27b96a a6f25f8)
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)
1  2 
karmaworld/urls.py patch | diff1 | diff2 | blob | history

diff --cc karmaworld/urls.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.