Fix merge conflict in prev_next.html
authorJef van Schendel <mail@jefvanschendel.nl>
Mon, 5 Mar 2012 23:31:34 +0000 (00:31 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Mon, 5 Mar 2012 23:31:34 +0000 (00:31 +0100)
commitfe53180359b03cfacfb45286fdc4c30cbfd9289f
treeb251f9f5af56296deb0bac8b5ada78c9db15d016
parent1213b8260ab4da97d465e7ef0e71fac2a2c20dbd
parente58f2599659cd1f11d6d296bce7b84c6e1ddde6c
Fix merge conflict in prev_next.html
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/utils/prev_next.html