Merge pull request #16 from gerMdz/15-wizard-principal

Cambios en el list e index de principales
gerMdz · Jul 16, 2021 · b6248c7 · b6248c7
2 parents c3356ab + 0f1d8f9
commit b6248c7
Show file tree

Hide file tree

Showing 15 changed files with 2,790 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,8 @@
 {
     "type": "project",
     "license": "MIT",
+    "name": "germdz/alamedacms",
+    "description": "CMS Sencillo con reservas por email, y manejo de usuarios",
     "require": {
         "php": "^7.1.3",
         "ext-ctype": "*",
@@ -30,7 +32,6 @@
         "symfony/intl": "4.4.*",
         "symfony/mailer": "4.4.*",
         "symfony/orm-pack": "^1.0",
-        "symfony/polyfill-iconv": "^1.22",
         "symfony/polyfill-php72": "^1.15",
         "symfony/security-bundle": "4.4.*",
         "symfony/serializer-pack": "^1.0",

diff --git a/public/asistente/css/bootstrap.min.css b/public/asistente/css/bootstrap.min.css