Merge remote-tracking branch 'refs/remotes/origin/hotline'
# Conflicts: # cosmogramme/sql/patch/patch_403.php # tests/db/UpgradeDBTest.php
Branches
Tags
Showing
- VERSIONS 17 additions, 0 deletionsVERSIONS
- application/modules/opac/views/scripts/bib-numerique/loan-book.phtml 3 additions, 0 deletions.../modules/opac/views/scripts/bib-numerique/loan-book.phtml
- cosmogramme/sql/patch/patch_403.php 1 addition, 11 deletionscosmogramme/sql/patch/patch_403.php
- cosmogramme/sql/patch/patch_404.php 12 additions, 0 deletionscosmogramme/sql/patch/patch_404.php
- library/Class/File/Mime.php 22 additions, 0 deletionslibrary/Class/File/Mime.php
- library/Class/FileManager.php 12 additions, 12 deletionslibrary/Class/FileManager.php
- library/Class/FileManager/Icon.php 51 additions, 0 deletionslibrary/Class/FileManager/Icon.php
- library/Class/Hold/Pnb.php 69 additions, 10 deletionslibrary/Class/Hold/Pnb.php
- library/Class/Migration/CleanProfileModules.php 49 additions, 0 deletionslibrary/Class/Migration/CleanProfileModules.php
- library/Class/Systeme/Widget/Abstract.php 3 additions, 3 deletionslibrary/Class/Systeme/Widget/Abstract.php
- library/Class/User/Cards.php 5 additions, 0 deletionslibrary/Class/User/Cards.php
- library/Class/Users.php 7 additions, 0 deletionslibrary/Class/Users.php
- library/ZendAfi/Controller/Plugin/XHProfile.php 20 additions, 18 deletionslibrary/ZendAfi/Controller/Plugin/XHProfile.php
- library/ZendAfi/Form/Decorator/SearchAxeLabel.php 3 additions, 3 deletionslibrary/ZendAfi/Form/Decorator/SearchAxeLabel.php
- library/ZendAfi/View/Helper/Abonne/HoldsPNB.php 2 additions, 12 deletionslibrary/ZendAfi/View/Helper/Abonne/HoldsPNB.php
- library/ZendAfi/View/Helper/TagDilicomWidget.php 4 additions, 2 deletionslibrary/ZendAfi/View/Helper/TagDilicomWidget.php
- library/ZendAfi/View/Helper/Thumbnail.php 3 additions, 0 deletionslibrary/ZendAfi/View/Helper/Thumbnail.php
- library/startup.php 2 additions, 6 deletionslibrary/startup.php
- library/storm 1 addition, 1 deletionlibrary/storm
- library/templates/Intonation/Library/Settings.php 7 additions, 3 deletionslibrary/templates/Intonation/Library/Settings.php
Please register or sign in to comment