Merge branch 'master' into origin-dev#27067-koha-restful-suggestion-service
Conflicts: library/Class/Users.php
Showing
- README 0 additions, 10 deletionsREADME
- README.md 26 additions, 0 deletionsREADME.md
- VERSIONS 16 additions, 0 deletionsVERSIONS
- VERSIONS_DEV.md 37 additions, 0 deletionsVERSIONS_DEV.md
- VERSION_HOTLINE/23975 0 additions, 1 deletionVERSION_HOTLINE/23975
- application/modules/admin/views/scripts/index/adminvar.phtml 10 additions, 19 deletionsapplication/modules/admin/views/scripts/index/adminvar.phtml
- application/modules/opac/controllers/AuthController.php 27 additions, 10 deletionsapplication/modules/opac/controllers/AuthController.php
- application/modules/opac/views/scripts/auth/boite-login.phtml 1 addition, 4 deletions...ication/modules/opac/views/scripts/auth/boite-login.phtml
- application/modules/telephone/views/scripts/abonne/fiche.phtml 74 additions, 76 deletions...cation/modules/telephone/views/scripts/abonne/fiche.phtml
- categories.org 0 additions, 254 deletionscategories.org
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_263.php 23 additions, 0 deletionscosmogramme/sql/patch/patch_263.php
- library/Class/AdminVar.php 6 additions, 2 deletionslibrary/Class/AdminVar.php
- library/Class/AdminVar/UnleashedFacets.php 29 additions, 0 deletionslibrary/Class/AdminVar/UnleashedFacets.php
- library/Class/Batch/Typo3.php 2 additions, 2 deletionslibrary/Class/Batch/Typo3.php
- library/Class/MoteurRecherche/Facettes.php 17 additions, 13 deletionslibrary/Class/MoteurRecherche/Facettes.php
- library/Class/ScriptLoader.php 25 additions, 3 deletionslibrary/Class/ScriptLoader.php
- library/Class/TextReplacements.php 2 additions, 0 deletionslibrary/Class/TextReplacements.php
- library/Class/User/ILSSubscription.php 85 additions, 0 deletionslibrary/Class/User/ILSSubscription.php
- library/Class/Users.php 45 additions, 15 deletionslibrary/Class/Users.php
Please register or sign in to comment