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

fix location for custom/options/license #18194

Merged
merged 2 commits into from Jan 6, 2022
Merged

fix location for custom/options/license #18194

merged 2 commits into from Jan 6, 2022

Conversation

yearski
Copy link
Contributor

@yearski yearski commented Jan 6, 2022

This effectively recreates PR #15669 which was closed in anticipation of #15559 which did not come to be final.

@yearski
fix location for custom/options/license
8eb9ed3 
This effectively recreates PR #15669 which was closed in anticipation of #15559 which did not come to be final.
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 6, 2022
@techknowlogick techknowlogick added type/docs This PR mainly updates/creates documentation skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jan 6, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 6, 2022
@techknowlogick techknowlogick merged commit 0acc6a4 into go-gitea:main Jan 6, 2022
zjjhot pushed a commit to zjjhot/gitea that referenced this pull request Jan 7, 2022
Merge branch 'main' of https://github.com/go-gitea/gitea
4839f4d 
* 'main' of https://github.com/go-gitea/gitea:
  Fix mermaid rendering in milestone dashboard (go-gitea#18202)
  Don't store assets modified time into generated files (go-gitea#18193)
  Add warning for BIDI characters in page renders and in diffs (go-gitea#17562)
  [skip ci] Updated translations via Crowdin
  Bump mermaid from 8.13.4 to 8.13.8 (go-gitea#18198)
  fix location for custom/options/license (go-gitea#18194)
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@yearski
fix location for custom/options/license (go-gitea#18194)
1ab82cb
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@Gusted Gusted Gusted approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/docs This PR mainly updates/creates documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@yearski @techknowlogick @Gusted @GiteaBot