Marie Birner e4376c29b4 Merge commit 'db3cf59d21a14ed87b6226484a1d7adb19322f64' ... # Conflicts: # templates/includes/forms/log.html.tera # templates/kiosk.html.tera		2023-07-30 15:10:48 +02:00
..
forms	Merge commit 'db3cf59d21a14ed87b6226484a1d7adb19322f64'	2023-07-30 15:10:48 +02:00
buttons.html.tera	format tera files	2023-07-30 14:33:50 +02:00
cox-icon.html.tera	format tera files	2023-07-30 14:33:50 +02:00
delete-icon.html.tera	format tera files	2023-07-30 14:33:50 +02:00
footer.html.tera	format tera files	2023-07-30 14:33:50 +02:00
funnel-icon.html.tera	format tera files	2023-07-30 14:33:50 +02:00
lock-icon.html.tera	format tera files	2023-07-30 14:33:50 +02:00
macros.html.tera	format tera files	2023-07-30 14:33:50 +02:00
plus-icon.html.tera	format tera files	2023-07-30 14:33:50 +02:00
question-icon.html.tera	format tera files	2023-07-30 14:33:50 +02:00