Merge branch 'stable' into hotline-master
Conflicts: VERSIONS cosmogramme/php/_init.php cosmogramme/sql/patch/patch_236.php library/startup.php public/opac/css/global.css
Branches
Tags
Please register or sign in to comment
Conflicts: VERSIONS cosmogramme/php/_init.php cosmogramme/sql/patch/patch_236.php library/startup.php public/opac/css/global.css