Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into origin-master
Conflicts: VERSIONS
Showing
- VERSIONS 7 additions, 1 deletionVERSIONS
- library/Class/WebService/BibNumerique/Assimil.php 9 additions, 1 deletionlibrary/Class/WebService/BibNumerique/Assimil.php
- library/Class/WebService/BibNumerique/Assimil/XMLParser.php 30 additions, 4 deletionslibrary/Class/WebService/BibNumerique/Assimil/XMLParser.php
- library/Class/WebService/Lastfm.php 24 additions, 32 deletionslibrary/Class/WebService/Lastfm.php
- library/ZendAfi/View/Helper/Admin/HelpLink.php 5 additions, 3 deletionslibrary/ZendAfi/View/Helper/Admin/HelpLink.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- public/admin/skins/bokeh74/global.css 1 addition, 1 deletionpublic/admin/skins/bokeh74/global.css
- public/admin/skins/bokeh74/icons/bokeh-logo.png 0 additions, 0 deletionspublic/admin/skins/bokeh74/icons/bokeh-logo.png
- tests/fixtures/assimil.xml 2735 additions, 1576 deletionstests/fixtures/assimil.xml
- tests/fixtures/assimil_with_24_ressources.xml 2492 additions, 0 deletionstests/fixtures/assimil_with_24_ressources.xml
- tests/fixtures/lastfm_bashung_albums.html 1970 additions, 0 deletionstests/fixtures/lastfm_bashung_albums.html
- tests/fixtures/lastfm_bashung_albums.xml 338 additions, 0 deletionstests/fixtures/lastfm_bashung_albums.xml
- tests/library/Class/WebService/AssimilTest.php 40 additions, 4 deletionstests/library/Class/WebService/AssimilTest.php
- tests/library/Class/WebService/LastfmTest.php 47 additions, 0 deletionstests/library/Class/WebService/LastfmTest.php
Please register or sign in to comment