Patrick Barroca
authored
Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master Conflicts: VERSIONS library/Class/Catalogue.php library/startup.php tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
Name | Last commit | Last update |
---|---|---|
.. | ||
application/modules | ||
db | ||
fixtures | ||
js | ||
library | ||
scenarios | ||
.htaccess | ||
TestSpeedTrap.php | ||
TestXPathFactory.php | ||
autounit | ||
bootstrap.php | ||
bootstrap_frontcontroller.php | ||
phpunit.xml |