Merge branch 'master' into origin-dev_#17782_merge_print_fusion (8524cbd5) · 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 8524cbd5 authored 9 years ago by

Laurent

Browse files

Merge branch 'master' into origin-dev_#17782_merge_print_fusion

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_267.php
	library/Class/Notice.php

parents f002fc66 3917a83b

Branches

Tags 8.0.22

Hide whitespace changes

Inline Side-by-side

Showing with 217 additions and 128 deletions

Please register or to comment

Admin message

Merge branch 'master' into origin-dev_#17782_merge_print_fusion