Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
|---|---|---|
| .. | ||
| edit.tmpl | ||
| list.tmpl | ||
| new.tmpl | ||
| view.tmpl | ||
| view_details.tmpl | ||
| view_emails.tmpl | ||
Follow #32383 and #32402 --- Conflict resolution: Magic, painful. (cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0) |
||
|---|---|---|
| .. | ||
| edit.tmpl | ||
| list.tmpl | ||
| new.tmpl | ||
| view.tmpl | ||
| view_details.tmpl | ||
| view_emails.tmpl | ||