Conflicts: templates/user/signup.tmpl |
||
|---|---|---|
| .. | ||
| dashboard.tmpl | ||
| delete.tmpl | ||
| profile.tmpl | ||
| publickey_add.tmpl | ||
| publickey_added.tmpl | ||
| signin.tmpl | ||
| signup.tmpl | ||
Conflicts: templates/user/signup.tmpl |
||
|---|---|---|
| .. | ||
| dashboard.tmpl | ||
| delete.tmpl | ||
| profile.tmpl | ||
| publickey_add.tmpl | ||
| publickey_added.tmpl | ||
| signin.tmpl | ||
| signup.tmpl | ||