Merge branch 'persona_resquash'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 15 Aug 2013 22:07:14 +0000 (17:07 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 15 Aug 2013 22:07:14 +0000 (17:07 -0500)
commit97b9b98c1e2571e5617d6a2135d46c4874ac6f51
treebb590f16f317be6cc6a0ba15daaeaab2544df432
parent4834ef8ec21e985290f5e0015ae9452070956170
parentcd612ee68902fed1bad981f0c72b338d03fa2aab
Merge branch 'persona_resquash'
mediagoblin/auth/views.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html