Merge remote-tracking branch 'refs/remotes/origin/master' into... (9660949a) · 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.

There was a problem fetching the pipeline stages.

Commit 9660949a authored 8 years ago by

Ghislain Loas

Browse files

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

Merge remote-tracking branch 'refs/remotes/origin/master' into dev#57858_remplacer_le_treeselect_en_front_par_le_composant_multiselect

Conflicts:
	library/Class/ScriptLoader.php
	public/opac/css/global.css

parents 48fb8418 22b55f2f

Pipeline #816 passed with stage

in 22 minutes and 23 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 110 additions and 97 deletions

Please register or to comment

Admin message

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