Skip to content
  • Patrick Barroca's avatar
    version 7.1.16 · e20dde86
    Patrick Barroca authored
    Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master
    
    # Conflicts:
    #	VERSIONS
    #	library/ZendAfi/View/Helper/Notice/Unimarc.php
    #	library/startup.php
    e20dde86