Skip to content
Commit 4b804668 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into master-sqlserver 

Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php
parents 78a3625d 9058d398
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