Lukas ‎‎‎‎ 09bd01a634 Merge branch 'dev' into 'lukas-jwts' ... # Conflicts: # app/classes/web/panel_handler.py # app/frontend/templates/notify.html # app/translations/en_EN.json # requirements.txt		2022-01-16 10:54:55 +00:00
..
static/assets	Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev	2022-01-14 23:07:06 +02:00
templates	Merge branch 'dev' into 'lukas-jwts'	2022-01-16 10:54:55 +00:00