Skip to content
Snippets Groups Projects
Commit 047563bd authored by Hazelnoot's avatar Hazelnoot
Browse files

Merge branch 'develop' into hazelnoot/579-reject-reports

# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
parents 7dd29601 6d7c7357
No related branches found
No related tags found
No related merge requests found
Showing
with 121 additions and 41 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