Merge branch 'stable' into 'hotline-master' (0eee94ae) · 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
0eee94ae

Commit 0eee94ae authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'stable' into 'hotline-master'

Stable

See merge request !1276

parents 33d53d47 b6612623

Branches

Tags

4 merge requests!1553Master,!1283Master,!1282Hotline master,!1278Hotline master

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/32771 1 addition, 0 deletions

VERSIONS_HOTLINE/32771
library/ZendAfi/View/Helper/Panier/Edit.php 19 additions, 19 deletions

library/ZendAfi/View/Helper/Panier/Edit.php
public/opac/skins/modele/css/global.css 1 addition, 1 deletion

public/opac/skins/modele/css/global.css
public/opac/skins/original/css/global.css 1 addition, 1 deletion

public/opac/skins/original/css/global.css
tests/application/modules/opac/controllers/PanierControllerTest.php 5 additions, 0 deletions

...ication/modules/opac/controllers/PanierControllerTest.php

with 27 additions and 21 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