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

changes after cwebb's review

2013-06-21 14:14:40 -07:00

routing.py

moved forgot pass to basic_auth plugin

2013-08-16 10:28:47 -07:00

tools.py

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

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

views.py

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

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