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.

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

4.0 to 4.1 #36836

Merged
merged 3 commits into from
Jan 25, 2022
Merged

4.0 to 4.1 #36836

merged 3 commits into from
Jan 25, 2022

Conversation

bembelimen
Copy link
Contributor

Pull Request for Issue # .

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

laoneo and others added 3 commits January 25, 2022 01:34
* Set jform i API request for assigned catid

* Update libraries/src/MVC/Controller/ApiController.php

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* Update libraries/src/MVC/Controller/ApiController.php

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
# Conflicts:
#	libraries/src/MVC/Controller/ApiController.php
#	plugins/editors/tinymce/tinymce.php
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.1-dev labels Jan 25, 2022
@bembelimen bembelimen changed the title 4.0 to 4,1 4.0 to 4.1 Jan 25, 2022
@bembelimen bembelimen merged commit ef77227 into joomla:4.1-dev Jan 25, 2022
@bembelimen bembelimen added this to the Joomla 4.1.0 milestone Jan 25, 2022
@bembelimen bembelimen deleted the 4.1/upmerges/2022-01-25 branch January 23, 2024 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NPM Resource Changed This Pull Request can't be tested by Patchtester
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants