Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Asset] Remove import from URL #15

Merged
merged 2 commits into from
May 10, 2023
Merged

[Asset] Remove import from URL #15

merged 2 commits into from
May 10, 2023

Conversation

brusch
Copy link
Member

@brusch brusch commented Apr 17, 2023

No description provided.

@brusch brusch added the Task label Apr 17, 2023
@brusch brusch added this to the 1.0.0 milestone Apr 17, 2023
@fashxp
Copy link
Member

fashxp commented Apr 17, 2023 •
edited by dvesh3

@kingjia90
Merge remote-tracking branch 'origin/1.x' into remove_import_from_url
95e72aa 
# Conflicts:
#	public/js/pimcore/asset/tree.js
#	src/Controller/Admin/Asset/AssetController.php
@kingjia90 kingjia90 mentioned this pull request May 2, 2023
Merged
@kingjia90 kingjia90 merged commit a7c3858 into 1.x May 10, 2023
6 checks passed
@kingjia90 kingjia90 deleted the remove_import_from_url branch May 10, 2023 07:58
@github-actions github-actions bot locked and limited conversation to collaborators May 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@kingjia90 kingjia90 kingjia90 approved these changes

Assignees

@kingjia90 kingjia90

Labels
Task
Projects
None yet
Milestone
1.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@brusch @fashxp @kingjia90