Merge remote-tracking branch 'refs/remotes/origin/master' into... (a6a05db0) · 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 a6a05db0 authored 10 years ago by

Laurent

Browse files

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev_#13657_newsletter_pagination_batch_mail

Conflicts:
	library/startup.php

parents 7b834ea9 f2461e6b

Branches

Admin message

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