-
- Downloads
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts: htdocs/core/lib/functions.lib.php
No related branches found
No related tags found
Showing
- htdocs/comm/action/class/actioncomm.class.php 1 addition, 1 deletionhtdocs/comm/action/class/actioncomm.class.php
- htdocs/comm/action/listactions.php 1 addition, 1 deletionhtdocs/comm/action/listactions.php
- htdocs/comm/action/peruser.php 1 addition, 1 deletionhtdocs/comm/action/peruser.php
- htdocs/comm/action/rapport/index.php 3 additions, 2 deletionshtdocs/comm/action/rapport/index.php
- htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php 1 addition, 1 deletionhtdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
- htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php 1 addition, 1 deletionhtdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
- htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php 1 addition, 1 deletionhtdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
- htdocs/contact/card.php 4 additions, 4 deletionshtdocs/contact/card.php
- htdocs/contact/exportimport.php 2 additions, 2 deletionshtdocs/contact/exportimport.php
- htdocs/contact/ldap.php 2 additions, 2 deletionshtdocs/contact/ldap.php
- htdocs/contact/list.php 1 addition, 1 deletionhtdocs/contact/list.php
- htdocs/contact/note.php 2 additions, 2 deletionshtdocs/contact/note.php
- htdocs/contact/perso.php 4 additions, 4 deletionshtdocs/contact/perso.php
- htdocs/core/class/html.form.class.php 1 addition, 1 deletionhtdocs/core/class/html.form.class.php
- htdocs/core/class/html.formfile.class.php 5 additions, 3 deletionshtdocs/core/class/html.formfile.class.php
- htdocs/install/check.php 3 additions, 3 deletionshtdocs/install/check.php
- htdocs/install/mysql/migration/3.6.0-3.7.0.sql 2 additions, 0 deletionshtdocs/install/mysql/migration/3.6.0-3.7.0.sql
- htdocs/install/mysql/tables/llx_actioncomm.sql 2 additions, 2 deletionshtdocs/install/mysql/tables/llx_actioncomm.sql
- htdocs/install/mysql/tables/llx_resource.sql 1 addition, 1 deletionhtdocs/install/mysql/tables/llx_resource.sql
- htdocs/langs/en_US/admin.lang 1 addition, 0 deletionshtdocs/langs/en_US/admin.lang
Loading
Please register or sign in to comment