Skip to content
Snippets Groups Projects
  1. Feb 14, 2014
  2. Feb 13, 2014
  3. Feb 07, 2014
  4. Jan 30, 2014
  5. Jan 27, 2014
  6. Jan 24, 2014
  7. Jan 23, 2014
  8. Jan 20, 2014
  9. 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
  10. Jan 13, 2014
  11. Jan 09, 2014
  12. Jan 08, 2014
  13. Jan 07, 2014
  14. Jan 06, 2014
  15. Jan 03, 2014
  16. Dec 30, 2013
  17. Dec 27, 2013
  18. Dec 26, 2013
  19. Dec 19, 2013
  20. Dec 18, 2013
  21. Dec 16, 2013
  22. Dec 13, 2013
  23. Dec 12, 2013
  24. Dec 09, 2013
  25. Dec 05, 2013