vcs.fsf.org Git - mediagoblin.git/commit

author	Christopher Allan Webber <cwebber@dustycloud.org>
	Thu, 19 Sep 2013 21:04:23 +0000 (16:04 -0500)
committer	Christopher Allan Webber <cwebber@dustycloud.org>
	Thu, 19 Sep 2013 21:04:23 +0000 (16:04 -0500)
commit	74ae6fb0b620c2f899e2c97ba5f6af105103df6f
tree	1fc5a7634299ba221858536a12d3fa8066a1898f	tree \| snapshot (zip tar.gz)
parent	3dc6184167691d390f016c2b73fd6a9887955102	commit \| diff
parent	f9931418d65c7823e13bc45f647a682ddf3b8632	commit \| diff

Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'

Conflicts:
mediagoblin/auth/views.py
mediagoblin/edit/forms.py
mediagoblin/templates/mediagoblin/edit/edit_account.html

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

mediagoblin/auth/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/edit/forms.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/edit/routing.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/edit/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/templates/mediagoblin/edit/edit_account.html	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_edit.py	diff1 \|	diff2 \|	blob \| history