Fix merge conflicts
[mediagoblin.git] / mediagoblin / templates / mediagoblin / submit /
drwxr-xr-x   ..
-rw-r--r-- 1373 start.html