Skip to content
Snippets Groups Projects
Commit 70a1a6b5 authored by Nils Erik Krumnack's avatar Nils Erik Krumnack
Browse files

Merge branch 'cherry-pick-a7b56918-21.2' into '21.2' 

Sweeping !47656 from master to 21.2.
AsgServices: Use std::nullptr_t for gcc11

See merge request !47688
parents ddc3b6ab 2ebcb9fc
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