Skip to content
Snippets Groups Projects
Commit 95990bc5 authored by Klaus Aehlig's avatar Klaus Aehlig
Browse files

Merge branch 'stable-2.7' into stable-2.8


Conflicts:
	NEWS
	doc/rapi.rst

Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parents 2827d1ac 811f8b31
No related branches found
No related tags found
No related merge requests found
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