Merge branch 'master' of git.cubedesigners.com:cubedesigners-oxygene

# Conflicts:
#	systeme/CONNEXION.$D1
#	systeme/SYSNUMS.$D1

diff --cc oxygene.quota
index dcfb7996633963a61ee4988a4728540e0ebd31b3,4e86b18fe06452f4d2f65a26e1c9dcb9eea813a3..4d086985c9fa342b59cf0e591aaaffbba134cbbc
--- 1/oxygene.quota
--- 2/oxygene.quota
+++ b/oxygene.quota
@@@ -1,9 -1,13 +1,13 @@@
  [quotainfo]
  disk=C:\Program Files (x86)\Memsoft Oxygene\oxydev\systeme\bin
  size=63751319552
+ <<<<<<< HEAD
+ avail=2380099584
+ useravail=2380099584
+ =======
  <<<<<<< after-close-2025
 -avail=3655540736
 -useravail=3655540736
 +avail=1098289152
 +useravail=1098289152
  =======
  avail=4175458304
  useravail=4175458304

diff --cc systeme/licences/suscribe.data
index 9a76cde84f306ecc325694526f2ee7022eb5e7ee,3de7c0866e428441b0a11ed830451fa9acb819d7..ac4b0fb80e7f8d8f550c984fa646c36a5ff94afa
--- 1/systeme/licences/suscribe.data
--- 2/systeme/licences/suscribe.data
+++ b/systeme/licences/suscribe.data
@@@ -1,7 -1,11 +1,11 @@@
  [status]
  <<<<<<< HEAD
+ <<<<<<< HEAD
+ 93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0AE80D6D74696A8BE3
+ 130=315A4E6E18FDA98C0C187624F3BB2491E2FCA54269E185E2A502CFBD9FBDF0B6ADAACD35A3828741
+ =======
  <<<<<<< after-close-2025
 -93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0A71460D34BD760E2A
 +93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0A4E71A385F12AA24A
  130=315A4E6E18FDA98C0C187624F3BB2491E2FCA54269E185E2A502CFBD9FBDF0B6ADAACD35A3828741
  =======
  93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0AA9019B0300E220F9