Skip to content
Snippets Groups Projects
  • Georges Racinet's avatar
    eaa3f52bccd6
    Upstream merge up to the 17.7 branching point · eaa3f52bccd6
    Georges Racinet authored
    Conflicts:
    
     - `doc/build/build_docker_image.md`, the usual does not matter much
     - in `config/projects.rb`, upstram added some FIPS condition before
       the declaration of (build) dependencies, conflicted with our
       added one for `go-license-detector`.
    eaa3f52bccd6
    History
    Upstream merge up to the 17.7 branching point
    Georges Racinet authored
    Conflicts:
    
     - `doc/build/build_docker_image.md`, the usual does not matter much
     - in `config/projects.rb`, upstram added some FIPS condition before
       the declaration of (build) dependencies, conflicted with our
       added one for `go-license-detector`.