johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop
Some checks failed
_STAGING / build-bundle (push) Has been cancelled
Details
_STAGING / build-docker (push) Has been cancelled
Details
_DEVELOP / build-bundle (push) Has been cancelled
Details
_DEVELOP / build-docker (push) Has been cancelled
Details
Commit Message Check / Check Commit Message (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Andrey Antukh
2025-11-04 12:49:57 +01:00
parent 21fb38e5bd 37aa59b164
commit c850f101d3
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/app/rpc/commands/profile.clj
View File

@@ -484,7 +484,6 @@
WHERE tpr1.profile_id = ? WHERE tpr1.profile_id = ?
AND tpr1.is_owner IS true AND tpr1.is_owner IS true
AND tpr2.can_edit IS true AND tpr2.can_edit IS true
AND NOT t.is_default
AND t.deleted_at IS NULL") AND t.deleted_at IS NULL")
(sv/defmethod ::get-subscription-usage (sv/defmethod ::get-subscription-usage

1
frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.scss
View File

@@ -23,6 +23,7 @@
.element-set-content { .element-set-content {
@include deprecated.flexColumn; @include deprecated.flexColumn;
grid-column: span 8;
margin: deprecated.$s-4 0 deprecated.$s-8 0; margin: deprecated.$s-4 0 deprecated.$s-8 0;
} }