diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-04 23:14:08 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-04 23:14:08 -0600 |
| commit | 04b0b7a124130fe4db082c419e6f44a5a212ffab (patch) | |
| tree | 257c51b90aa86810efb839c0ad9af3bb3eb758c2 /mediagoblin/gmg_commands/users.py | |
| parent | a085dda5d29a1353eaf7df3ddfc3a7c500af9186 (diff) | |
| parent | 707001950a42c7adfd6657f227a2c2dbbd09afce (diff) | |
| download | mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.tar.lz mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.tar.xz mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.zip | |
Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
Conflicts:
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
Diffstat (limited to 'mediagoblin/gmg_commands/users.py')
0 files changed, 0 insertions, 0 deletions