Skip to content
Snippets Groups Projects
Commit 62a8c7ba authored by Gottfried Gaisbauer's avatar Gottfried Gaisbauer
Browse files

Merge branch 'master' into 'origin/aura' 

# Conflicts:
#   libraries/database/broadcasts.py
#   libraries/security/user.py
#   libraries/security/whitelist.py
parents a9c94736 4f859608
No related branches found
No related tags found
2 merge requests!2Origin/aura into master,!1development branch to master branch
Pipeline #
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2319 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment