Skip to content

Commit

Permalink
Merge branch 'master' into 2346-name-ec2-instances-for-quick-identifi…
Browse files Browse the repository at this point in the history
…cation-in-console
  • Loading branch information
Matthew-Grayson authored Oct 24, 2023
2 parents d25558c + 6bfba99 commit eaa7fae
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 112 deletions.
74 changes: 37 additions & 37 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 37 additions & 37 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion frontend/src/test-utils/test-utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { MemoryRouter } from 'react-router-dom';
import { AuthContext, AuthContextType } from '../context/AuthContext';
import { CFThemeProvider } from 'context';
import { authCtx } from './authCtx';
import { Props } from 'react-select';

interface CustomRenderOptions extends RenderOptions {
initialHistory?: string[];
Expand Down
Loading

0 comments on commit eaa7fae

Please sign in to comment.