Merge jQuery branch, resolve conflicts
authorJef van Schendel <mail@jefvanschendel.nl>
Tue, 13 Dec 2011 14:15:57 +0000 (15:15 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Tue, 13 Dec 2011 14:15:57 +0000 (15:15 +0100)
commitbb3b9e4090706e1e9815c5132c01b9e706e31360
treef6a1eb6c0db46bd445bdd67128181206f735b5a8
parentd44140a212fddab3301cbf3a97d3197f8879277b
parentb27067371d6cb99cf21c7c0970b664e970d9a22d
Merge jQuery branch, resolve conflicts
mediagoblin/static/css/base.css
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/media.html