Skip to content
Snippets Groups Projects
Commit c8d20a86 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'refs/remotes/afi/dev#56107_bonus_1655_retro_sprint_73_pb_plugin_pour_afficher_des_donnees_metier_dans_un_articles_integrer_une_notice_une_sitotheque_avec_des_boutons_ckeditor' into afi-master

# Conflicts:
#	library/Class/Feature/List.php
parents 967fbd38 cdba63d7
Branches
Tags
No related merge requests found
Pipeline #3330 passed with stage
in 26 minutes and 40 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 286 additions and 101 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment