-
- Downloads
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts: htdocs/core/boxes/box_activity.php
No related branches found
No related tags found
Showing
- ChangeLog 18 additions, 10 deletionsChangeLog
- build/launchpad/README 31 additions, 18 deletionsbuild/launchpad/README
- build/obs/README 13 additions, 0 deletionsbuild/obs/README
- build/rpm/dolibarr_fedora.spec 1 addition, 1 deletionbuild/rpm/dolibarr_fedora.spec
- build/rpm/dolibarr_generic.spec 1 addition, 1 deletionbuild/rpm/dolibarr_generic.spec
- build/rpm/dolibarr_mandriva.spec 1 addition, 1 deletionbuild/rpm/dolibarr_mandriva.spec
- build/rpm/dolibarr_opensuse.spec 1 addition, 1 deletionbuild/rpm/dolibarr_opensuse.spec
- htdocs/adherents/card_subscriptions.php 5 additions, 4 deletionshtdocs/adherents/card_subscriptions.php
- htdocs/adherents/cotisations.php 2 additions, 2 deletionshtdocs/adherents/cotisations.php
- htdocs/adherents/index.php 3 additions, 1 deletionhtdocs/adherents/index.php
- htdocs/adherents/liste.php 3 additions, 1 deletionhtdocs/adherents/liste.php
- htdocs/adherents/stats/byproperties.php 3 additions, 4 deletionshtdocs/adherents/stats/byproperties.php
- htdocs/adherents/stats/geo.php 1 addition, 2 deletionshtdocs/adherents/stats/geo.php
- htdocs/adherents/stats/index.php 2 additions, 0 deletionshtdocs/adherents/stats/index.php
- htdocs/admin/dict.php 3 additions, 2 deletionshtdocs/admin/dict.php
- htdocs/admin/limits.php 130 additions, 118 deletionshtdocs/admin/limits.php
- htdocs/admin/mails.php 1 addition, 1 deletionhtdocs/admin/mails.php
- htdocs/admin/modules.php 6 additions, 5 deletionshtdocs/admin/modules.php
- htdocs/admin/notification.php 10 additions, 1 deletionhtdocs/admin/notification.php
- htdocs/admin/perms.php 4 additions, 0 deletionshtdocs/admin/perms.php
Loading
Please register or sign in to comment