Skip to content
Snippets Groups Projects
Commit 5cdee1a3 authored by Kevin Falcone's avatar Kevin Falcone
Browse files

Merge branch '4.0-trunk' into 4.0.0-releng

Conflicts:
	README
	docs/UPGRADING-4.0
parents e68d1b47 4bdef722
No related branches found
Tags 7.x-1.5.8.2-wip
No related merge requests found
Showing
with 180 additions and 113 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment