Merge branch 'ticket-679' into OPW-Moderation-Update
authortilly-Q <nattilypigeonfowl@gmail.com>
Mon, 29 Jul 2013 22:40:19 +0000 (18:40 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Mon, 29 Jul 2013 22:40:19 +0000 (18:40 -0400)
commit52a355b27541597fc155dab5e4885207b12a0a7b
tree7d00edf4d9e39a6b7e4c838ca6f7cb07a4d9a51c
parentf26c21cd5b7998c903fa67aaf164c07743fee651
parent08cd10d84fd89df3f0cad3835ba8ab8b8000d4b2
Merge branch 'ticket-679' into OPW-Moderation-Update

Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/db/migration_tools.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/user_pages/views.py
15 files changed:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/db/migrations.py
mediagoblin/db/mixin.py
mediagoblin/db/models.py
mediagoblin/db/util.py
mediagoblin/decorators.py
mediagoblin/gmg_commands/users.py
mediagoblin/routing.py
mediagoblin/static/css/base.css
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/tools/response.py
mediagoblin/user_pages/views.py