Skip to content
Snippets Groups Projects
Commit 8871352e authored by Rafael László's avatar Rafael László :speech_balloon:
Browse files

Merge branch 'dev' into about

# Conflicts:
#	src/Routes.tsx
parents 524aba87 3aaa6154
No related branches found
No related tags found
2 merge requests!19fix type imports,!16About page
Showing
with 617 additions and 145 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment