Skip to content
Snippets Groups Projects
Commit 833391a0 authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Merge branch 'devel-2.4' into stable-2.5 


Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 69f78cf7 8e5a705d
No related branches found
No related tags found
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