Merge branch 'hotline_6.41' into 'master' (7129e00c) · 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
7129e00c

Commit 7129e00c authored 11 years ago by

Laurent

Downloads
- Plain Diff

Merge branch 'hotline_6.41' into 'master'

Hotline 6.41

parents 149e361b 77122aea

Branches

Tags

2 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!73Ft/R13039

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 2 additions, 0 deletions

VERSIONS
library/Class/WebService/SIGB/Pergame/Service.php 6 additions, 4 deletions

library/Class/WebService/SIGB/Pergame/Service.php
library/ZendAfi/View/Helper/Admin/SubscribeUsers.php 1 addition, 1 deletion

library/ZendAfi/View/Helper/Admin/SubscribeUsers.php
public/admin/css/global.css 6 additions, 0 deletions

public/admin/css/global.css
tests/application/modules/admin/controllers/NewsletterControllerTest.php 4 additions, 4 deletions

...on/modules/admin/controllers/NewsletterControllerTest.php
tests/library/Class/WebService/SIGB/PergameTest.php 39 additions, 15 deletions

tests/library/Class/WebService/SIGB/PergameTest.php

with 58 additions and 24 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