Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
0ab8f11a60
crafty-4/app/frontend
History
Andrew 0ab8f11a60 Merge branch 'dev' into 'pretzel' 
# Conflicts:
#   app/classes/shared/server.py
#   app/classes/web/panel_handler.py
#   main.py
2021-08-18 16:34:41 +00:00
..
static/assets Merge logo swap 2021-03-21 23:50:38 -05:00
templates Merge branch 'dev' into 'pretzel' 2021-08-18 16:34:41 +00:00