Changeset 109950 in spip-zone


Ignore:
Timestamp:
Apr 19, 2018, 11:15:54 AM (3 years ago)
Author:
abelass
Message:

Merge branch 'master' into v1

Conflicts:

paquet.xml
promotions/reservation_multiple_simple.php

Location:
_plugins_/reservations_multiples/branches/v1
Files:
3 edited

Legend:

Unmodified
Added
Removed
Note: See TracChangeset for help on using the changeset viewer.