Merge remote-tracking branch 'origin/master'

SECURITY.md

@@ -6,10 +6,11 @@ The following versions are currently being supported with security updates.
 | Version | Supported          |
 | ------- | ------------------ |
 | 2.0     | :x: (to be released) |
+| 1.11.26 | :white_check_mark: |
 | 1.11.24 | :white_check_mark: |
 | 1.11.22 | :white_check_mark: |
 | 1.11.20 | :white_check_mark: |
-| 1.11.18 | :white_check_mark: |
+| 1.11.18 | :x: |
 | 1.11.16 | :x: |
 | 1.11.14 | :x: |
 | <1.11.14 | :x: |

src/CoreBundle/Resources/views/Admin/Settings/menu.html.twig

@@ -4,7 +4,7 @@
     'admin': 'star',
     'announcement': 'bullhorn',
     'agenda': 'calendar-text',
-    'attendance': 'inbox-full',
+    'attendance': 'av-timer',
     'cas': 'cloud-key',
     'certificate': 'certificate',
     'chat': 'chat-processing',