Merge branch... (f8040033) · 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
f8040033

Commit f8040033 authored 9 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch...

Merge branch 'hotline#36324_valence_pb_toutapprendrearte_vod_1dtouch_sur_profil_smartphone' into 'stable'

Hotline#36324 valence pb toutapprendrearte vod 1dtouch sur profil smartphone

See merge request !1589

parents 91dc0187 2ef5864e

Branches

Tags

4 merge requests!1659Master,!1618Master,!1610Dev#35088 oai import in cosmogramme,!1595Master

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/36324 1 addition, 0 deletions

VERSIONS_HOTLINE/36324
application/modules/telephone/controllers/RechercheController.php 4 additions, 4 deletions

...ion/modules/telephone/controllers/RechercheController.php
library/Class/Album.php 2 additions, 2 deletions

library/Class/Album.php
library/Class/Notice.php 1 addition, 0 deletions

library/Class/Notice.php
tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php 1 addition, 1 deletion

...c/controllers/RechercheControllerAlbumAudioRecordTest.php
tests/application/modules/telephone/controllers/RechercheControllerRessourceNumeriqueTest.php 59 additions, 4 deletions

...controllers/RechercheControllerRessourceNumeriqueTest.php

with 68 additions and 11 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