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

Revert "[4.3] Template Diff View" #2681

Merged
merged 26 commits into from
Nov 29, 2022
Merged

Revert "[4.3] Template Diff View" #2681

merged 26 commits into from
Nov 29, 2022

Conversation

tecpromotion
Copy link
Member

Reverts #2669

zero-24 and others added 25 commits November 19, 2022 13:51
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Updating 4.3-dev with changes from 4.2-dev
[4.3] Fix language constants overrides in com_template.inis and com_c…
[4.3] Fix workflow/stage unpublish/trash/deletion prevention
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
[4.3] Allow creating of name.min.css
[4.3] Installation: Add hint for handling of existing tables with sam…
@tecpromotion tecpromotion changed the base branch from 4.2-dev to 4.3-dev November 29, 2022 16:36
@tecpromotion tecpromotion linked an issue Nov 29, 2022 that may be closed by this pull request
@tecpromotion
Copy link
Member Author

@zero-24 Du hattest den falschen Base-Branch und ich es zu spät gesehen.

@tecpromotion tecpromotion changed the base branch from 4.3-dev to 4.2-dev November 29, 2022 16:37
@tecpromotion
Copy link
Member Author

Muss natürlich im 4.2 wieder aufgeräumt werden.
@zero-24 kannst du das machen? Danke.

@zero-24 zero-24 merged commit 8b3a998 into 4.2-dev Nov 29, 2022
@zero-24 zero-24 deleted the revert-2669-2630 branch November 29, 2022 16:52
@zero-24
Copy link
Member

zero-24 commented Nov 29, 2022

Merge erstmal den revert damit sollten alle änderungen von meinem PR zurückgesetzt sein. Hab gerade einen neuen PR auf gemacht #2682

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

[4.3] Template Diff View
2 participants