Skip to content
Snippets Groups Projects
pbarroca's avatar
Patrick Barroca authored
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
#	public/opac/css/global.css
716ceb62
Name Last commit Last update
..
admin
captcha
opac