Merge remote-tracking branch 'origin/hotline_6.52' (25ac1b27) · 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
25ac1b27

Commit 25ac1b27 authored 10 years ago by

Julian Maurice

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/hotline_6.52'

parents 5bcad8d2 16363122

Branches

Tags

1 merge request!529Hotline 6.56

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 7 additions, 0 deletions

VERSIONS
amber/src/js/lib/CodeMirror/css.js 717 additions, 0 deletions

amber/src/js/lib/CodeMirror/css.js
application/modules/opac/controllers/RssController.php 1 addition, 1 deletion

application/modules/opac/controllers/RssController.php
cosmogramme/cosmozend/application/modules/cosmo/controllers/RunLogController.php 1 addition, 0 deletions

...pplication/modules/cosmo/controllers/RunLogController.php
library/Class/AlbumCategorie.php 7 additions, 6 deletions

library/Class/AlbumCategorie.php
library/Class/ScriptLoader.php 29 additions, 28 deletions

library/Class/ScriptLoader.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/library/Class/AlbumCategorieTest.php 36 additions, 32 deletions

tests/library/Class/AlbumCategorieTest.php

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