Skip to content
Commit aa5b03dd authored by andryyy's avatar andryyy
Browse files

Merge branch 'dev' 

Conflicts:
	data/web/autodiscover.php
parents 3213dcf9 b0584c36
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment