Skip to content
  • Laurent's avatar
    Merge branch 'master' into sandbox_new_config_gui · 41016b42
    Laurent authored
    Conflicts:
    	application/modules/admin/controllers/AccueilController.php
    	application/modules/admin/views/scripts/accueil/_retour.phtml
    	application/modules/admin/views/scripts/accueil/news.phtml
    	application/modules/admin/views/scripts/menus/_retour.phtml
    	application/modules/admin/views/scripts/profil/menusmaj.phtml
    	application/modules/admin/views/scripts/rss/rssform.phtml
    	application/modules/admin/views/scripts/subModal.phtml
    	library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php
    	library/ZendAfi/View/Helper/FonctionsAdmin/Menu.php
    	public/admin/js/config_accueil.js
    	public/admin/js/config_menu.js
    	public/admin/js/subModal.js
    	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
    41016b42