Merge remote-tracking branch... (0bd454bc) · Commits · afi / opacce · GitLab

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 0bd454bc authored 10 years ago by

Patrick Barroca

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/afi/dev#18026-categories-permissions-handling' into dev#18027-categories-permissions-retrocompat

Conflicts:
cosmogramme/sql/patch/patch_225.sql

parents 9634f5bf ca5baf93

Branches

Tags

2 merge requests!715Master,!696Dev#20351 articles admin as list

Hide whitespace changes

Inline Side-by-side

Showing with 54 additions and 44 deletions

Please register or to comment