Commit 80a8acf0 authored by Gandalf's avatar Gandalf
Browse files

Merge branch 'develop' into 'master' 

Enable Hiveauth in Rocket Chat login integration

See merge request !389
parents 34a2a4a0 5fccde3c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment