Resolve merge conflict and merge.
authorAditi <aditi.iitr@gmail.com>
Thu, 22 Aug 2013 17:04:06 +0000 (22:34 +0530)
committerAditi <aditi.iitr@gmail.com>
Thu, 22 Aug 2013 17:04:06 +0000 (22:34 +0530)
commit70cc6eb8f383dcc97aeac22216a9da0d65a09085
tree7f9d646002f2e6db763b1b3e89d9762efb12a544
parente018b2120ac4131afab6611c84f8cfbe0926e640
parente7b8059f17c98ee88d933af52b0c4d858e882e8e
Resolve merge conflict and merge.
mediagoblin/routing.py
mediagoblin/static/css/base.css
mediagoblin/templates/mediagoblin/base.html
mediagoblin/user_pages/views.py