Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/origin/hotline#110044_site_demofr_tres_lent' into hotline#110044_site_demofr_lenteurs # Conflicts: # library/templates/Intonation/Library/View/Wrapper/Record.php
Branches
Tags
Showing
- VERSIONS_HOTLINE/110044 1 addition, 0 deletionsVERSIONS_HOTLINE/110044
- library/Class/Profil.php 16 additions, 4 deletionslibrary/Class/Profil.php
- library/templates/Intonation/Library/View/Wrapper/Author.php 1 addition, 4 deletionslibrary/templates/Intonation/Library/View/Wrapper/Author.php
- library/templates/Intonation/Library/View/Wrapper/Record.php 14 additions, 3 deletionslibrary/templates/Intonation/Library/View/Wrapper/Record.php
Please register or sign in to comment