Skip to content
Snippets Groups Projects
  1. Jun 17, 2016
  2. Jun 13, 2016
  3. Jun 10, 2016
  4. Sep 20, 2014
  5. 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
  6. Sep 23, 2013
  7. Sep 18, 2013
  8. Sep 17, 2013
  9. Aug 26, 2013
  10. Jul 22, 2013
  11. Feb 22, 2013
  12. Jan 31, 2013
  13. Jan 02, 2013
  14. Dec 21, 2012
  15. Dec 20, 2012
  16. Dec 19, 2012
  17. Dec 18, 2012