Changeset 108394 in spip-zone for _plugins_/prix_objets/branches/v1


Ignore:
Timestamp:
Jan 8, 2018, 9:22:45 AM (9 months ago)
Author:
abelass
Message:

Merge branch 'master' into v1

Conflicts:

paquet.xml

Location:
_plugins_/prix_objets/branches/v1
Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed
  • _plugins_/prix_objets/branches/v1

  • _plugins_/prix_objets/branches/v1/paquet.xml

    r106816 r108394  
    22        prefix="prix_objets"
    33        categorie="edition"
    4         version="1.7.7"
     4        version="1.7.8"
    55        etat="stable"
    66        compatibilite="[3.0.5;3.2.*]"
    7         logo=""
     7        logo="prive/themes/spip/images/prix_objets-64.png"
    88        documentation=""
    99        schema="1.5.0"
     
    2626        <pipeline nom="affiche_milieu" inclure="prix_objets_pipelines.php" />
    2727        <pipeline nom="shop_objets" inclure="prix_objets_pipelines.php" />
    28         <pipeline nom="reservation_evenement_objets_configuration" inclure="prix_objets_pipelines.php" />
    29 </paquet>
     28        <pipeline nom="reservation_evenement_objets_configuration" inclure="prix_objets_pipelines.php" /></paquet>
Note: See TracChangeset for help on using the changeset viewer.