Unverified Commit 0a09b46c authored by Sergey Lyubka's avatar Sergey Lyubka Committed by GitHub

Merge pull request #1128 from rojer/amalgam

Sync src with amalgamated versions
parents 73a2b922 b0a1cd7b
Pipeline #471 failed with stages