diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-28 22:05:54 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-28 22:05:54 -0500 |
| commit | 7dc3a66f924c734cbee68677e84f5b656eefe280 (patch) | |
| tree | df091eb3589ec2a7ab711acbe137af3c97a583f0 /mediagoblin/edit/forms.py | |
| parent | ad56a4826b987a0fa8f65849d3611f61cc1f50d6 (diff) | |
| parent | 46df0297e029c075a2c28b0c31490c560c99158c (diff) | |
| download | mediagoblin-7dc3a66f924c734cbee68677e84f5b656eefe280.tar.lz mediagoblin-7dc3a66f924c734cbee68677e84f5b656eefe280.tar.xz mediagoblin-7dc3a66f924c734cbee68677e84f5b656eefe280.zip | |
Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'
Conflicts:
mediagoblin/edit/views.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/routing.py
Diffstat (limited to 'mediagoblin/edit/forms.py')
0 files changed, 0 insertions, 0 deletions