Merge remote-tracking branch 'refs/remotes/origin/hotline-master' (d82ccd5a) · 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
d82ccd5a

Commit d82ccd5a authored 8 years ago by

Laurent

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/hotline-master'

Conflicts:
	VERSIONS

parents 80a6788c e2bcb5b1

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 5 additions, 0 deletions

VERSIONS
library/Class/Profil/SkinUpdateReader.php 2 additions, 3 deletions

library/Class/Profil/SkinUpdateReader.php
library/Class/Systeme/ModulesMenu/Accueil.php 4 additions, 2 deletions

library/Class/Systeme/ModulesMenu/Accueil.php
library/startup.php 1 addition, 1 deletion

library/startup.php
public/admin/skins/bokeh74/global.css 4 additions, 3 deletions

public/admin/skins/bokeh74/global.css
public/admin/skins/retro/global.css 3 additions, 2 deletions

public/admin/skins/retro/global.css
tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php 16 additions, 1 deletion

.../modules/opac/controllers/ProfilOptionsControllerTest.php
tests/library/Class/Profil/SkinUpdateReaderTest.php 1 addition, 1 deletion

tests/library/Class/Profil/SkinUpdateReaderTest.php

with 36 additions and 13 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