Christopher Allan Webber 894fa564e7 Merge branch 'master' into jwandborg-f482_media_attachments ...

Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html

2011-08-22 21:48:45 -05:00

..

__init__.py

Adds license header

2011-07-30 08:39:07 -04:00

forms.py

Minor change to indentation

2011-08-10 12:44:58 -05:00

routing.py

Merge branch 'master' into jwandborg-f482_media_attachments

2011-08-22 21:48:45 -05:00

views.py

Merge branch 'master' into jwandborg-f482_media_attachments

2011-08-22 21:48:45 -05:00