Fix merge conflicts
authorJef van Schendel <mail@jefvanschendel.nl>
Thu, 5 Jan 2012 20:42:56 +0000 (21:42 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Thu, 5 Jan 2012 20:42:56 +0000 (21:42 +0100)
commitd2fce291b535ab5f36c8cc6e4bd9648373e39ef8
tree710f9d767fd6fbb35d89cd2ec2b150fb5f3fc53e
parent34b4090cbf1f6ea62b9127f0ac96e748ad22b668
parent7df9f45c32d7fd2ae5ae6c137ebf96437f764323
Fix merge conflicts
mediagoblin/static/css/base.css
mediagoblin/templates/mediagoblin/auth/change_fp.html
mediagoblin/templates/mediagoblin/auth/register.html
mediagoblin/templates/mediagoblin/edit/attachments.html
mediagoblin/templates/mediagoblin/edit/edit.html
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
mediagoblin/templates/mediagoblin/user_pages/user.html