Commit ef36bf9c authored by Gandalf's avatar Gandalf
Browse files

Merge branch 'develop' into 'master' 

Don't create accounts in Rocket Chat via iframe, but only in Oauth flow

See merge request !379
parents f27d0eaf 887bfe57
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