Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master (8b46378c) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

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.

afi
opacce
Commits
8b46378c

Commit 8b46378c authored 8 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
#	library/translation/en.mo
#	library/translation/en.po

parents dda2ed82 7e270168

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 5 additions, 0 deletions

VERSIONS
library/ZendAfi/Acl/AdminControllerGroup.php 5 additions, 0 deletions

library/ZendAfi/Acl/AdminControllerGroup.php
library/ZendAfi/Acl/AdminControllerRoles.php 2 additions, 1 deletion

library/ZendAfi/Acl/AdminControllerRoles.php
library/translation/en.mo 0 additions, 0 deletions

library/translation/en.mo
library/translation/en.po 2 additions, 2 deletions

library/translation/en.po
library/translation/es.mo 0 additions, 0 deletions

library/translation/es.mo
library/translation/fr.mo 0 additions, 0 deletions

library/translation/fr.mo
library/translation/ro.mo 0 additions, 0 deletions

library/translation/ro.mo
tests/application/modules/admin/controllers/UsersControllerTest.php 10 additions, 0 deletions

...ication/modules/admin/controllers/UsersControllerTest.php
tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php 20 additions, 3 deletions

...library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php

with 44 additions and 6 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment