diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-16 16:28:12 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-16 16:28:12 -0500 |
commit | 5f72a4c3314a6e6c0d05d916f380557fdf744d57 (patch) | |
tree | 1e6958635f398cf29089a082bd62727bcdf11ff1 /docs/hackinghowto.rst | |
parent | 8e9331c1069e5c5bcf1b8d68b59eeff63123fd14 (diff) | |
parent | 380ac094f6ebcf7b457d98a86ac7cc0af2347ba4 (diff) | |
download | mediagoblin-5f72a4c3314a6e6c0d05d916f380557fdf744d57.tar.lz mediagoblin-5f72a4c3314a6e6c0d05d916f380557fdf744d57.tar.xz mediagoblin-5f72a4c3314a6e6c0d05d916f380557fdf744d57.zip |
Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/process_media/__init__.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/util.py
Diffstat (limited to 'docs/hackinghowto.rst')
0 files changed, 0 insertions, 0 deletions