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

Develop merge #311

Merged
merged 31 commits into from
Oct 26, 2023
Merged

Develop merge #311

merged 31 commits into from
Oct 26, 2023

Conversation

waTeim
Copy link
Contributor

@waTeim waTeim commented Oct 10, 2023

Add recent changes from Develop

setup.cfg Outdated
@@ -33,7 +33,7 @@ install_requires =
django-saml2-auth==2.2.1
djangorestframework==3.12.2
drf-spectacular==0.15.1
tycho-api==1.14.1
tycho-api==1.15.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Still cool with removing this entirely if you'd like.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think I'll miss it.

@pj-linebaugh
Copy link
Contributor

Let's get this merged. I was just working with Griffin on final touches for the UI merge of develop->master/main. Planning to do this merge tomorrow.

@pj-linebaugh pj-linebaugh self-assigned this Oct 26, 2023
@pj-linebaugh pj-linebaugh merged commit 6612c0d into master Oct 26, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants