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

Feature/wysiwyg #1517

Merged
merged 29 commits into from
Jan 10, 2024
Merged

Feature/wysiwyg #1517

merged 29 commits into from
Jan 10, 2024

Conversation

Yinci
Copy link
Collaborator

@Yinci Yinci commented May 31, 2023

No description provided.

@Yinci Yinci added enhancement New feature or request awaiting approval Something requires approval labels May 31, 2023
Yinci added 8 commits June 7, 2023 11:55
# Conflicts:
#	app/Http/Livewire/Cooperation/Frontend/Tool/SimpleScan/MyPlan/Comments.php
#	public/js/app.js
#	public/mix-manifest.json
@Yinci Yinci added accepted Something was approved and removed awaiting approval Something requires approval labels Jul 4, 2023
# Conflicts:
#	public/css/admin/app.css
#	public/css/frontend/app.css
#	public/js/app.js
#	public/mix-manifest.json
# Conflicts:
#	app/Console/Commands/RunDeploy.php
#	database/seeders/ToolQuestionsTableSeeder.php
#	package-lock.json
#	package.json
#	public/css/frontend/app.css
#	public/css/pdf.css
#	public/js/app.js
#	public/mix-manifest.json
#	resources/css/frontend/components/form.css
@Yinci Yinci merged commit 5bd4743 into develop Jan 10, 2024
2 of 4 checks passed
@Yinci Yinci deleted the feature/wysiwyg branch January 10, 2024 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
accepted Something was approved enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant