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

DEV: Fix edit-topic-timer issues #27015

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

DEV: Fix edit-topic-timer issues #27015

wants to merge 14 commits into from

Conversation

CvX
Copy link
Contributor

@CvX CvX commented May 14, 2024

No description provided.

# Conflicts:
#	app/assets/javascripts/.licensee.json
#	app/assets/javascripts/admin/package.json
#	app/assets/javascripts/discourse-hbr/package.json
#	app/assets/javascripts/discourse-widget-hbs/package.json
#	app/assets/javascripts/float-kit/package.json
#	app/assets/javascripts/pretty-text/package.json
#	app/assets/javascripts/select-kit/package.json
#	app/assets/javascripts/truth-helpers/package.json
#	app/assets/javascripts/yarn-ember3.lock
#	app/assets/javascripts/yarn-ember5.lock
# Conflicts:
#	app/assets/javascripts/truth-helpers/package.json
# Conflicts:
#	app/assets/javascripts/discourse/app/components/modal/edit-topic-timer.js
# Conflicts:
#	app/assets/javascripts/discourse-hbr/package.json
#	yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
1 participant