Merge branch 'master' into origin-dev#38660_library_increase_image_size (858c18ad) · Commits · afi / opacce

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit 858c18ad authored 9 years ago by

Laurent

Browse files

Merge branch 'master' into origin-dev#38660_library_increase_image_size

Conflicts:
	library/Class/Bib.php

parents 9d43912e 2de3978c

5 merge requests!1659Master,!1587Master,!1573Dev#38660 library increase image size,!1571Dev#38660 library increase image size,!1570Dev#38660 library increase image size

Hide whitespace changes

Inline Side-by-side

Showing with 100 additions and 26 deletions

Please register or to comment

Admin message

Merge branch 'master' into origin-dev#38660_library_increase_image_size