projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5568a01 58dd8d9)
Merge remote branch 'remotes/inconexo/588_lowercase_extension'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Sat, 26 Nov 2011 12:50:06 +0000 (13:50 +0100)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Sat, 26 Nov 2011 12:50:06 +0000 (13:50 +0100)
* 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

1  2 
mediagoblin/media_types/image/processing.py patch | diff1 | diff2 | blob | history

Unnamed repository; edit this file 'description' to name the repository.