7e1aa8a5cd
Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
---|---|---|
.. | ||
authorlink.tmpl | ||
avatarlink.tmpl | ||
blocked_users.tmpl | ||
name.tmpl | ||
namelink.tmpl | ||
org_profile_avatar.tmpl | ||
profile_big_avatar.tmpl |