Compare commits

...
2 Commits
Author SHA1 Message Date
DebaucheryLibrarian c9e698c906 0.57.4 2026-07-23 23:06:21 +02:00
DebaucheryLibrarian 286248e403 Widened actor merge avatar conflict ignore scope. 2026-07-23 23:06:18 +02:00
3 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -1,11 +1,11 @@
{
"name": "traxxx-web",
"version": "0.57.3",
"version": "0.57.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"version": "0.57.3",
"version": "0.57.4",
"dependencies": {
"@brillout/json-serializer": "^0.5.25",
"@dicebear/collection": "7.0.5",
+1 -1
View File
@@ -92,7 +92,7 @@
"overrides": {
"vite": "$vite"
},
"version": "0.57.3",
"version": "0.57.4",
"imports": {
"#/*": "./*.js"
},
+1 -1
View File
@@ -871,7 +871,7 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse
trx('actors_avatars')
.update('actor_id', targetActorId)
.whereIn('actor_id', sourceActorIds)
.onConflict(['profile_id', 'media_id'])
.onConflict()
.ignore(),
]);