diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-17 11:47:29 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-17 11:47:29 -0600 |
| commit | d1d535602cce3d93c5ee32f034d361ef99610cc1 (patch) | |
| tree | 655c83c873d6d788820747ec159340a66e2f0b09 /mediagoblin/tests/test_auth.py | |
| parent | 30af7ce6ad322938d814a80a296846c63fdd2b25 (diff) | |
| parent | 10d241976447ab87dfebfebf9679a796400f6445 (diff) | |
| download | mediagoblin-d1d535602cce3d93c5ee32f034d361ef99610cc1.tar.lz mediagoblin-d1d535602cce3d93c5ee32f034d361ef99610cc1.tar.xz mediagoblin-d1d535602cce3d93c5ee32f034d361ef99610cc1.zip | |
Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'
Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/root.html
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
0 files changed, 0 insertions, 0 deletions