diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-11-26 13:50:06 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-11-26 13:50:06 +0100 |
| commit | e4113ad5b4226a7398ea0b629c2eae43b2f9c797 (patch) | |
| tree | 05df513a42ee3f3b81e0017af903c24a831ab865 /extlib/jquery/jquery.js | |
| parent | 5568a014195fa9f39021033a6ba2706125bb13ed (diff) | |
| parent | 58dd8d9e6326013528cdfdfeea375c4eade54b92 (diff) | |
| download | mediagoblin-e4113ad5b4226a7398ea0b629c2eae43b2f9c797.tar.lz mediagoblin-e4113ad5b4226a7398ea0b629c2eae43b2f9c797.tar.xz mediagoblin-e4113ad5b4226a7398ea0b629c2eae43b2f9c797.zip | |
Merge remote branch 'remotes/inconexo/588_lowercase_extension'
* remotes/inconexo/588_lowercase_extension:
Filename extensions are lowercased before uploading the image.
The merge failed really. It tried to apply the changes to
the wrong file. So applied them by hand to
mediagoblin/media_types/image/processing.py
Conflicts:
mediagoblin/processing.py
Diffstat (limited to 'extlib/jquery/jquery.js')
0 files changed, 0 insertions, 0 deletions