Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
[mediagoblin.git] / mediagoblin / templates /
drwxr-xr-x   ..
drwxr-xr-x - mediagoblin