Skip to content

Commit

Permalink
Merge branch 'dev' into dj_42
Browse files Browse the repository at this point in the history
  • Loading branch information
wlorenzetti authored Jan 2, 2025
2 parents 7eec8bd + b23f91e commit 8f6168a
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion g3w-admin/client/static/client/app.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion g3w-admin/client/static/client/app.min.js.map

Large diffs are not rendered by default.

Empty file modified g3w-admin/client/static/client/images/editAttributes.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
134 changes: 67 additions & 67 deletions g3w-admin/client/static/client/vendor.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions g3w-admin/client/static/client/vendor.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion g3w-admin/editing/static/editing/js/plugin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion g3w-admin/editing/static/editing/js/plugin.js.map

Large diffs are not rendered by default.

0 comments on commit 8f6168a

Please sign in to comment.