Skip to content
Snippets Groups Projects
Commit bb72816a authored by lbrun's avatar lbrun
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'refs/remotes/origin/dev#30143_create_album_record_thumbnail_from_first_image'

Conflicts:
	tests/application/modules/opac/controllers/RechercheControllerTest.php
parents fd6e67b4 bd69fd0d
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 432 additions and 65 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment