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

[1.x] Merge pull request #1179 from phpDocumentor/feature/tables-to-rst #1182

Merged
merged 4 commits into from
Nov 22, 2024
Merged

[1.x] Merge pull request #1179 from phpDocumentor/feature/tables-to-rst #1182

merged 4 commits into from
Nov 22, 2024

Conversation

phpdoc-bot
Copy link

Backport

This will backport the following commits from main to 1.x:

Questions ?

Please refer to the Backport tool documentation

linawolf and others added 3 commits November 22, 2024 14:38
@linawolf
[FEATURE] Render tables to rst
0cad92c 
(cherry picked from commit 668f7e1)
@jaapio
Require iconv as we need multibyte strings
90c8632 
(cherry picked from commit dd18562)

# Conflicts:
#	composer.lock
@jaapio
Add iconv to ci
f7722e3 
(cherry picked from commit bafbb25)

# Conflicts:
#	.github/workflows/integrate.yaml
@phpdoc-bot phpdoc-bot mentioned this pull request Nov 22, 2024
Merged
@jaapio jaapio enabled auto-merge November 22, 2024 14:53
@jaapio jaapio merged commit f8c6cf3 into 1.x Nov 22, 2024
46 checks passed
@jaapio jaapio deleted the backport/1.x/pr-1179 branch November 22, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jaapio jaapio

Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@phpdoc-bot @jaapio @linawolf