Merge branch 'hotline-master' into 'master' (14d429fc) · 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
14d429fc

Commit 14d429fc authored 9 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline-master' into 'master'

Hotline master

See merge request !1523

parents 96a3513a 66ff83e9

Branches

Tags 7.12.44

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 10 additions, 0 deletions

VERSIONS
cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php 56 additions, 22 deletions

...n/modules/cosmo/controllers/IntegrationControllerTest.php
library/Class/Cosmogramme/Generator.php 31 additions, 2 deletions

library/Class/Cosmogramme/Generator.php
library/Class/IntBib.php 6 additions, 2 deletions

library/Class/IntBib.php
library/Class/Zone.php 9 additions, 0 deletions

library/Class/Zone.php
library/ZendAfi/Form/Admin/Library.php 7 additions, 6 deletions

library/ZendAfi/Form/Admin/Library.php
library/startup.php 1 addition, 1 deletion

library/startup.php
public/admin/skins/bokeh74/global.css 10 additions, 0 deletions

public/admin/skins/bokeh74/global.css
public/admin/skins/retro/global.css 10 additions, 0 deletions

public/admin/skins/retro/global.css
tests/application/modules/admin/controllers/BibControllerTest.php 20 additions, 33 deletions

...plication/modules/admin/controllers/BibControllerTest.php

with 160 additions and 66 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