diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-26 15:09:35 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-26 15:09:35 -0500 |
| commit | c0516158896e2bdf1592f1331b9ecf1979d4c099 (patch) | |
| tree | 1e11fbb0666c2048ac3fb90e77e051b95a9d7357 /mediagoblin/processing/task.py | |
| parent | e3e5980624d70922b84df764d32625d088fb841c (diff) | |
| parent | 0f8221dca40dc8628f8b8146a2ef2043e95781c2 (diff) | |
| download | mediagoblin-c0516158896e2bdf1592f1331b9ecf1979d4c099.tar.lz mediagoblin-c0516158896e2bdf1592f1331b9ecf1979d4c099.tar.xz mediagoblin-c0516158896e2bdf1592f1331b9ecf1979d4c099.zip | |
Merge remote-tracking branch 'remotes/slikdigit/bassam'
Conflicts:
mediagoblin/media_types/image/processing.py
Diffstat (limited to 'mediagoblin/processing/task.py')
0 files changed, 0 insertions, 0 deletions