Skip to content
Snippets Groups Projects
  1. Jan 03, 2018
  2. Sep 30, 2017
  3. Jun 17, 2016
  4. Jun 13, 2016
  5. Jun 10, 2016
  6. Sep 20, 2014
  7. Jan 17, 2014
    • efalcy's avatar
      Resolve conflicts · 71fd8299
      efalcy authored
      Conflicts:
      	.gitattributes
      	.gitignore
      	application/modules/admin/controllers/AlbumController.php
      	application/modules/admin/controllers/HarvestController.php
      	application/modules/admin/controllers/SystemeController.php
      	cosmogramme/php/classes/classe_notice_avenio.php
      	cosmogramme/php/classes/classe_notice_integration.php
      	cosmogramme/php/classes/classe_unimarc.php
      	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
      	library/Class/Album.php
      	library/Class/FRBR/Link.php
      	library/Class/Indexation.php
      	library/Class/NatureDoc.php
      	library/Class/Notice.php
      	library/Class/Profil.php
      	library/Class/WebService/BibNumerique/RessourceNumerique.php
      	library/ZendAfi/Controller/Plugin/AdminAuth.php
      	scripts/emacs/phafi-autoload.el
      	tests/application/modules/admin/controllers/AdminAuthControllerTest.php
      	tests/application/modules/admin/controllers/AlbumControllerTest.php
      	tests/application/modules/admin/controllers/HarvestControllerTest.php
      	tests/application/modules/opac/controllers/IndexContro...
      71fd8299
  8. Sep 23, 2013
  9. Sep 18, 2013
  10. Sep 17, 2013
  11. Aug 26, 2013
  12. Jul 22, 2013
  13. Feb 22, 2013
  14. Jan 31, 2013
  15. Jan 02, 2013
  16. Dec 21, 2012
  17. Dec 20, 2012
  18. Dec 19, 2012
  19. Dec 18, 2012