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

Merge branch 'dev-branch' into 'sensorAndUser' 

Dev branch

See merge request !82
parents 877cec63 d6ba42cf
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...,!82Dev branch
Show whitespace changes
Inline Side-by-side
Showing
with 86 additions and 35 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment