Resolve merge conflicts
authorJef van Schendel <mail@jefvanschendel.nl>
Tue, 21 Feb 2012 16:43:05 +0000 (17:43 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Tue, 21 Feb 2012 16:43:05 +0000 (17:43 +0100)
commitaa8804719c7930181aa7a0af41ca5b983fdf5be4
treeba3f8a30d3b72e6b29bdd71823df2c33d4bb2b27
parent6c2e57304c302acfc005686515ce91d91727dd8d
parent99812bbc4a76735824708b341ea283f09a1b423c
Resolve merge conflicts
mediagoblin/static/css/base.css
mediagoblin/templates/mediagoblin/user_pages/media.html