Merge remote branch 'remotes/gullydwarf-cfdv/is330'
[mediagoblin.git] / mediagoblin / templates / mediagoblin / edit /
drwxr-xr-x   ..
-rw-r--r-- 1694 edit.html
-rw-r--r-- 1392 edit_profile.html