Merge branch 'dev#20351-articles-admin-as-list' (bde3e157) · 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 bde3e157 authored 10 years ago by

Ghislain Loas

Browse files

Merge branch 'dev#20351-articles-admin-as-list'

Conflicts:
	application/modules/admin/controllers/CmsController.php
	cosmogramme/php/_init.php
	library/Class/AdminVar.php
	library/Class/ArticleCategorie.php
	library/Class/Catalogue.php
	library/Class/TypeDoc.php
	library/Class/Users.php
	tests/application/modules/admin/controllers/CmsControllerTest.php

parents 5882a8c6 720bd472

Branches

Admin message

Merge branch 'dev#20351-articles-admin-as-list'