Skip to content
Commit 82c76f6b authored by Andrew Janke's avatar Andrew Janke
Browse files

Merge changes from #4241 into installer-portable-colors 

Conflicts:
	tools/install.sh
	tools/upgrade.sh
parents fe92ea98 ba5fd57c
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