• 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/IndexControllerTest.php
    	tests/library/Class/FRBR/LinkTest.php
    	tests/library/Class/ProfilTest.php
    71fd8299
Name
Last commit
Last update
..
examples Loading commit data...
extension Loading commit data...
xhprof_html Loading commit data...
xhprof_lib Loading commit data...
.arcconfig Loading commit data...
.gitignore Loading commit data...
CHANGELOG Loading commit data...
CREDITS Loading commit data...
LICENSE Loading commit data...
README Loading commit data...
composer.json Loading commit data...
package.xml Loading commit data...