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

Fix merge conflicts? #607

Merged
merged 4 commits into from
Jul 5, 2024
Merged

Fix merge conflicts? #607

merged 4 commits into from
Jul 5, 2024

Commits on Jun 30, 2024

  1. fixup

    @KhafraDev
    KhafraDev committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    b80fbaa View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. fixup! blank account page

    @KhafraDev
    KhafraDev committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    c2601f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. fixup! always use synergism.cc for quark bonus

    @KhafraDev
    KhafraDev committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    50646bf View commit details
    Browse the repository at this point in the history

  2. fixup! fix shitty bonus code

    @KhafraDev
    KhafraDev committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ded3616 View commit details
    Browse the repository at this point in the history