Skip to content
Snippets Groups Projects
Commit 2fdf3c71 authored by Duc Bui Tien's avatar Duc Bui Tien
Browse files

Merge branch 'settingsPage' into UnicadoGuiFrontend 

# Conflicts:
#	UnicadoGUI/Backend/main.py
#	UnicadoGUI/Backend/requirements.txt
#	UnicadoGUI/Frontend/package-lock.json
#	UnicadoGUI/Frontend/package.json
#	UnicadoGUI/Frontend/src/lib/index.ts
#	UnicadoGUI/Frontend/src/routes/+layout.svelte
#	UnicadoGUI/Frontend/src/routes/+page.svelte
#	UnicadoGUI/Frontend/src/routes/model/+page.svelte
#	UnicadoGUI/Frontend/src/routes/settings/+page.svelte
parents ca66db7e abc3f975
Branches
Tags
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 10057 additions and 4 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment