Andrew 3ab57f116c Merge branch 'dev' into 'refactor/config-json' ... # Conflicts: # app/classes/shared/helpers.py		2022-12-19 22:13:10 +00:00
..
classes	Merge branch 'dev' into 'refactor/config-json'	2022-12-19 22:13:10 +00:00
config	Prepare 4.0.19 release base	2022-12-01 01:18:40 +00:00
frontend	Fix id mismatch zip upload import	2022-12-15 18:48:15 -05:00
migrations	Add custom login image feature	2022-11-09 14:13:35 -05:00
translations	Merge branch 'feature/custom-login-background' of gitlab.com:crafty-controller/crafty-4 into feature/custom-login-background	2022-11-30 18:14:42 -05:00