Skip to content
Commit 7e886ae6 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'renky/master_fixes' 

Conflicts:
	install/sql/incremental/upd_0073.sql
parents 58964a90 62c0e92c
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