Marie Birner 15644e8a0b Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype ... # Conflicts: # templates/index.html.tera		2023-05-03 15:26:41 +02:00
..
admin/user	style delete button in admin view	2023-04-28 21:22:41 +02:00
auth	show input labels in default case	2023-04-28 21:06:14 +02:00
dynamics	add missing sidebar	2023-04-28 18:55:51 +02:00
forms	Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype	2023-05-03 15:26:41 +02:00
includes	Merge branch 'feature/cancelation' into 'main'	2023-04-28 19:50:48 +00:00
base.html.tera	[BUGFIX] favicon & title tag head	2023-04-13 21:27:05 +02:00
index.html.tera	Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype	2023-05-03 15:26:41 +02:00