Conflicts: admin/templates/index.php templates/layout.admin.php templates/layout.user.php All conflicts are fixed. |
||
|---|---|---|
| .. | ||
| ajax | ||
| appinfo | ||
| css | ||
| img | ||
| js | ||
| templates | ||
| admin.php | ||
| download.php | ||
| index.php | ||
| settings.php | ||
Conflicts: admin/templates/index.php templates/layout.admin.php templates/layout.user.php All conflicts are fixed. |
||
|---|---|---|
| .. | ||
| ajax | ||
| appinfo | ||
| css | ||
| img | ||
| js | ||
| templates | ||
| admin.php | ||
| download.php | ||
| index.php | ||
| settings.php | ||