Christopher Allan Webber 56c4ad89eb Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update' ...

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/user.html
	mediagoblin/tests/test_auth.py
	mediagoblin/tests/test_submission.py

2013-10-07 15:48:33 -05:00

..

__init__.py

It's 2012 all up in here

2012-02-02 09:44:13 -06:00

forms.py

Merge branch 'master' into OPW-Moderation-Update

2013-08-20 12:21:13 -04:00

lib.py

I did some more code-keeping in this commit. I added a lot of documentation, so

2013-09-03 16:19:07 -04:00

routing.py

I did some more code-keeping in this commit. I added a lot of documentation, so

2013-09-03 16:19:07 -04:00

views.py

Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'

2013-10-07 15:48:33 -05:00