projects / mediagoblin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aac428b 2d8ce46)
Merge remote-tracking branch 'refs/remotes/tryggvib/532-exif-creation-date'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 11 May 2013 18:48:42 +0000 (13:48 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 11 May 2013 18:48:42 +0000 (13:48 -0500)
commit058226d0d2d877715b263fd441deb01821f1f59a
treec0871be7592fa4e86c6e98a23d1b197560ab56a9tree | snapshot (zip tar.gz)
parentaac428bac2a4967999e1fad40ca9d3a7c6b71199commit | diff
parent2d8ce464de32611a86532313564e2e5ff1e2c0e5commit | diff
Merge remote-tracking branch 'refs/remotes/tryggvib/532-exif-creation-date'

Conflicts:
mediagoblin/config_spec.ini
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/config_spec.ini diff1 | diff2 | blob | history
mediagoblin/media_types/image/models.py diff1 | diff2 | blob | history
mediagoblin/templates/mediagoblin/user_pages/media.html diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.