diff --git a/.gitignore b/.gitignore index 157b938625..368dfbc10d 100755 --- a/.gitignore +++ b/.gitignore @@ -24,23 +24,23 @@ tests/_support/_generated/* /bootstrap/compiled.php composer.phar -/app/config/database.php -/app/config/mail.php -/app/database/*.sqlite -/app/storage/meta/services.json -/app/config/*/mail.php -/app/config/*/session.php -/app/config/*/database.php -/app/config/*/app.php -/app/config/*/ldap.php +app/config/database.php +app/config/mail.php +app/database/*.sqlite +app/storage/meta/services.json +app/config/*/mail.php +app/config/*/session.php +app/config/*/database.php +app/config/*/app.php +app/config/*/ldap.php public/packages/* -storage/views/* storage/logs/* storage/debugbar/ /bin/ .idea crowdin.yaml public/uploads/logo.gif +public/uploads/logo.svg public/uploads/logo.png .couscous storage/dumps/* diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index 4caa3106bf..f8240a5eb7 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -365,9 +365,9 @@ class CategoriesController extends Controller if ($asset->deleted_at=='') { $actions = '
'; - $actions .= ' '; + //$actions .= ' '; $actions .= ' '; - $actions .= '
'; + $actions .= ''; } elseif ($asset->deleted_at!='') { $actions = ''; }