projects / mediagoblin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite4113ad5b4226a7398ea0b629c2eae43b2f9c797
tree05df513a42ee3f3b81e0017af903c24a831ab865tree | snapshot (zip tar.gz)
parent5568a014195fa9f39021033a6ba2706125bb13edcommit | diff
parent58dd8d9e6326013528cdfdfeea375c4eade54b92commit | diff
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
mediagoblin/media_types/image/processing.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.