-
- Downloads
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts: htdocs/core/class/infobox.class.php
No related branches found
No related tags found
Showing
- ChangeLog 5 additions, 5 deletionsChangeLog
- htdocs/adherents/stats/byproperties.php 1 addition, 0 deletionshtdocs/adherents/stats/byproperties.php
- htdocs/adherents/stats/geo.php 1 addition, 0 deletionshtdocs/adherents/stats/geo.php
- htdocs/adherents/stats/index.php 1 addition, 0 deletionshtdocs/adherents/stats/index.php
- htdocs/admin/mails.php 2 additions, 2 deletionshtdocs/admin/mails.php
- htdocs/admin/sms.php 1 addition, 1 deletionhtdocs/admin/sms.php
- htdocs/comm/mailing/fiche.php 1 addition, 1 deletionhtdocs/comm/mailing/fiche.php
- htdocs/commande/liste.php 1 addition, 0 deletionshtdocs/commande/liste.php
- htdocs/core/class/html.formmail.class.php 1 addition, 1 deletionhtdocs/core/class/html.formmail.class.php
- htdocs/core/class/infobox.class.php 2 additions, 2 deletionshtdocs/core/class/infobox.class.php
- htdocs/core/modules/modOpenSurvey.class.php 2 additions, 2 deletionshtdocs/core/modules/modOpenSurvey.class.php
- htdocs/install/mysql/data/llx_const.sql 2 additions, 8 deletionshtdocs/install/mysql/data/llx_const.sql
- htdocs/install/mysql/migration/repair.sql 2 additions, 2 deletionshtdocs/install/mysql/migration/repair.sql
- htdocs/langs/es_MX/banks.lang 0 additions, 2 deletionshtdocs/langs/es_MX/banks.lang
- htdocs/langs/es_MX/bills.lang 0 additions, 2 deletionshtdocs/langs/es_MX/bills.lang
- htdocs/product/class/product.class.php 6 additions, 6 deletionshtdocs/product/class/product.class.php
- htdocs/public/members/new.php 1 addition, 1 deletionhtdocs/public/members/new.php
- htdocs/theme/amarok/ckeditor/config.js 8 additions, 0 deletionshtdocs/theme/amarok/ckeditor/config.js
- htdocs/theme/auguria/ckeditor/config.js 8 additions, 0 deletionshtdocs/theme/auguria/ckeditor/config.js
- htdocs/theme/bureau2crea/ckeditor/config.js 8 additions, 0 deletionshtdocs/theme/bureau2crea/ckeditor/config.js
Loading
Please register or sign in to comment