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

FP-1226: Add a2cps favicon (submod commit) #380

Merged
merged 2 commits into from
Oct 14, 2021
Merged

FP-1226: Add a2cps favicon (submod commit) #380

merged 2 commits into from
Oct 14, 2021

Conversation

wesleyboar
Copy link
Member

@wesleyboar wesleyboar commented Oct 14, 2021 •
edited
Loading

Overview  |  Issues  |  Changes  |  Screenshots  |  Testing  |  Caveats

@wesleyboar wesleyboar mentioned this pull request Oct 14, 2021
Merged
@wesleyboar wesleyboar marked this pull request as ready for review October 14, 2021 17:26
@wesleyboar wesleyboar requested review from duckonomy, taoteg and rstijerina and removed request for duckonomy October 14, 2021 17:27
rstijerina
rstijerina approved these changes Oct 14, 2021
View reviewed changes
Copy link
Member

@rstijerina rstijerina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wesleyboar
FP-1226: Update submodule to its main branch
9a9a072 
TACC/Core-CMS-Resources#97 was merged.

Updating taccsite_custom to its main branch via this branch allows merge of this branch's PR to update main branch with absolute latest submod commit.
@wesleyboar wesleyboar merged commit 8526a40 into main Oct 14, 2021
@wesleyboar wesleyboar deleted the task/FP-1226-a2cps-favicon branch October 14, 2021 17:46
@wesleyboar
Copy link
Member Author

wesleyboar commented Oct 14, 2021 •
edited
Loading

I updated the submod commit post-approval to get the same diff, but a later commit (the commit from main that is the merge of TACC/Core-CMS-Resources#97).

This avoids, on Core-CMS main, the taccsite_custom pointer being one commit behind its main, which always confuses me a little bit.

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

@rstijerina rstijerina rstijerina approved these changes

@taoteg taoteg Awaiting requested review from taoteg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wesleyboar @rstijerina