Skip to content
Snippets Groups Projects
Commit dcb308b8 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge remote-tracking branch 'refs/remotes/origin/hotline' into origin-master

Conflicts:
	cosmogramme/tests/php/classes/KohaRecordIntegrationTest.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	tests/library/Class/WebService/LastfmTest.php
parents 07f3ede0 8f481849
Branches
Tags
Pipeline #8343 passed with stage
in 40 minutes and 16 seconds