New explore (!115) · Merge requests · Eirik Steira / Team 14 - IDATT1002 · GitLab

Snippets Groups Projects

Merged Stian Fjæran Mogen requested to merge new_explore into dev 5 years ago

All threads resolved!

Viewing commit 2de4e8ed

Show latest version

Files

36

2de4e8ed

Merge branch 'dev' into 'new_explore' · 2de4e8ed
Stian Fjæran Mogen authored 5 years ago
```
# Conflicts:
#   src/main/java/NTNU/IDATT1002/controllers/Explore.java
```