Skip to content

Commit 321a804

Browse files
committed
Merge branch 'dev' into Shared-User-Account
2 parents 82a7420 + 53c93e7 commit 321a804

File tree

177 files changed

+10164
-2515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+10164
-2515
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<PackageVersion Include="RabbitMQ.Client" Version="7.1.2" />
150150
<PackageVersion Include="Rebus" Version="8.8.0" />
151151
<PackageVersion Include="Rebus.ServiceProvider" Version="10.5.0" />
152-
<PackageVersion Include="Riok.Mapperly" Version="4.3.0" />
152+
<PackageVersion Include="Riok.Mapperly" Version="4.3.1" />
153153
<PackageVersion Include="Scriban" Version="6.3.0" />
154154
<PackageVersion Include="Serilog" Version="4.3.0" />
155155
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@
783783
"Enum:SourceChannel:1": "Studio",
784784
"Enum:SourceChannel:2": "Support Site",
785785
"Enum:SourceChannel:3": "Suite",
786-
"Menu:OrganizationTokenUsage": "Organization Token Usage",
786+
"Menu:AITokens": "AI Tokens",
787787
"Permission:OrganizationTokenUsage": "Organization Token Usage"
788788
}
789789
}
Lines changed: 173 additions & 0 deletions
74.8 KB
52.5 KB
141 KB
45.3 KB
56 KB
60.8 KB
56.3 KB

0 commit comments

Comments
 (0)