projects / mediagoblin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b2ea4b) | patch
Resolve merge conflict.
authorAditi <aditi.iitr@gmail.com>
Thu, 29 Aug 2013 05:04:47 +0000 (10:34 +0530)
committerAditi <aditi.iitr@gmail.com>
Thu, 29 Aug 2013 05:04:47 +0000 (10:34 +0530)
commitb0802bc3b27d0faf8628e0829332b5509351ae62
tree1434e91990a16d31116b638cec0135e4e512c4b9tree | snapshot (zip tar.gz)
parent0b2ea4bb4f96885c445e69a67785ea25587a3962commit | diff
Resolve merge conflict.
mediagoblin/routing.py diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.