Skip to content
Snippets Groups Projects
Commit 727d7fc4 authored by Daniel Høyland's avatar Daniel Høyland
Browse files

Merge branch 'dev-branch' into 'sensorAndUser' 

Dev branch

See merge request !85
parents 818b9847 17958fbd
No related branches found
No related tags found
3 merge requests!87Added sorting to both user page and sensor page, fixed up in adding, editing...,!86Added sorting to both user page and sensor page, fixed up in adding, editing...,!85Dev branch
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment