Skip to content
Commit 0bd40532 authored by nmatuschek's avatar nmatuschek
Browse files

Merge commit '8aae8bf5' 

Conflicts:
	sql/dbupdate.php
parents 105dffe2 8aae8bf5
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