Skip to content
Snippets Groups Projects
Verified Commit f8474a5e authored by Birk Gustav Samson Stoveland's avatar Birk Gustav Samson Stoveland :speech_balloon:
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/it2810-h21/team-24/project2-it2810 into 13-create-page-for-visualizing-commits-per-branch

 Conflicts:
	package-lock.json
	src/App.tsx
	src/components/NavBar/index.tsx
	src/helpers/api-calls.ts
	src/helpers/types.ts
parents 16f38084 532e2628
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment