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

Feature/6/group memberships #34

Merged
merged 3 commits into from
Nov 15, 2024
Merged

Feature/6/group memberships #34

merged 3 commits into from
Nov 15, 2024

Commits on Nov 15, 2024

  1. Extract mock data

    @balintking
    balintking committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    59a52a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/6/profile-page' into feature/6/group-memberships 

    # Conflicts:
#	frontend/components/profile-page.tsx
    @balintking
    balintking committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    4cf923d View commit details
    Browse the repository at this point in the history

  3. Resolve merge

    @balintking
    balintking committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    c9002f7 View commit details
    Browse the repository at this point in the history