diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-06 22:38:19 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-06 22:38:19 -0500 |
| commit | 1f69672478a4f65fc6b84e3feedb5f3763c420f1 (patch) | |
| tree | 0221ccbebf651686e5043e893b26563119ece7f5 /docs/conf.py | |
| parent | 0f7dc0b4a9ad8b51dada3a034bb9276fa1775380 (diff) | |
| parent | 02542d54e1c0556cee79c9f1d75c5dc64aeb18c8 (diff) | |
| download | mediagoblin-1f69672478a4f65fc6b84e3feedb5f3763c420f1.tar.lz mediagoblin-1f69672478a4f65fc6b84e3feedb5f3763c420f1.tar.xz mediagoblin-1f69672478a4f65fc6b84e3feedb5f3763c420f1.zip | |
Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'
Conflicts:
mediagoblin/edit/views.py
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions