This commit was the work I did fixing errors that cropped up from the merge.
authortilly-Q <nattilypigeonfowl@gmail.com>
Tue, 30 Jul 2013 21:09:01 +0000 (17:09 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Thu, 1 Aug 2013 00:11:26 +0000 (20:11 -0400)
commit9d6e453f8fd337813c2933835aedff2949193fbe
tree99a307b30ea3bbc6cfc81c4e9d2ea437935e894e
parent52a355b27541597fc155dab5e4885207b12a0a7b
This commit was the work I did fixing errors that cropped up from the merge.
There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I
cleared them up.
mediagoblin/db/migrations.py
mediagoblin/db/util.py
mediagoblin/decorators.py
mediagoblin/gmg_commands/users.py
mediagoblin/moderation/tools.py
mediagoblin/moderation/views.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/user_pages/views.py