projects / mediagoblin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f69672 77b9580)
Merge remote branch 'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll...
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:47:33 +0000 (22:47 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:47:33 +0000 (22:47 -0500)
commitb27ec167864b6847e39d0aee877521f465d567d4
treefa3582edc277487bda82ca032bf010d7f950f96etree | snapshot (zip tar.gz)
parent1f69672478a4f65fc6b84e3feedb5f3763c420f1commit | diff
parent77b958018b8ef6343394b8f138e52944334a5e1ccommit | diff
Merge remote branch 'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll_and_gallery'

Conflicts:
mediagoblin/db/models.py
mediagoblin/db/models.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.