Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into mailing
Browse files Browse the repository at this point in the history
  • Loading branch information
frederic34 committed Nov 13, 2024
2 parents 5acb2b3 + 786472f commit d437dc6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.head_ref }}-
${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.base_ref }}-
${{ env.KEY_ROOT }}-${{ env.HASH }}-
${{ env.KEY_ROOT }}-
# ${{ env.KEY_ROOT }}-
- name: Setup MariaDB
uses: frederic34/setup-mariadb@v1
Expand Down
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -1721,7 +1721,7 @@ NEW: No overwrite of optionals during put() contact
NEW: Notifications: add Customer Order delivered (ORDER_NEW) in module Notification
NEW: Notifications: for Sign or Refused Propal from Online Page
NEW: Now we can edit amount on VAT and salaries clone action
NEW: only get opened contact from liste_contact function, to not have access to closed contact as mail receiver
NEW: only get open contact from liste_contact function, to not have access to closed contact as mail receiver
NEW: Option: MAIN_SECURITY_MAXFILESIZE_DOWNLOADED #yogosha10660
NEW: Option to manage deposit slips for more payment modes (not only
NEW: Option to show column for field and line selection on the left
Expand Down
2 changes: 1 addition & 1 deletion build/phpstan/phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -6567,7 +6567,7 @@ parameters:
-
message: '#^Property CommonObject\:\:\$note_public \(string\) in isset\(\) is not nullable\.$#'
identifier: isset.property
count: 2
count: 3
path: ../../htdocs/compta/facture/class/facture.class.php

-
Expand Down

0 comments on commit d437dc6

Please sign in to comment.