Skip to content
  • antonio.perez's avatar
    Merge origin/master · 34f999c2
    antonio.perez authored
    Conflicts:
    	src/main/webapp/dialogs/facette/addToFacetteDlg.xhtml
    	src/main/webapp/edition.xhtml
    34f999c2