Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Spliterash/MusicBox
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: FuntyGithub/MusicBox
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 6 files changed
  • 1 contributor

Commits on Aug 8, 2022

  1. add config options for "SignPlayer"

    @FuntyGithub
    FuntyGithub committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    a419ae7 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. fixxed/changed musicbox.use perms #24

    @FuntyGithub
    FuntyGithub committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    ac72862 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. resolve upstream conflict

    @FuntyGithub
    FuntyGithub committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    a063349 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into conflict-resolution

    @FuntyGithub
    FuntyGithub committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    e3c8622 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from FuntyGithub/conflict-resolution 

    Conflict resolution
    @FuntyGithub
    FuntyGithub authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    36429fb View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2025

  1. Merge branch 'master' into Upstream

    @FuntyGithub
    FuntyGithub authored Feb 28, 2025
    Configuration menu
    Copy the full SHA
    d3ef699 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from FuntyGithub/Upstream 

    Upstream merge
    @FuntyGithub
    FuntyGithub authored Feb 28, 2025
    Configuration menu
    Copy the full SHA
    ca3ab40 View commit details
    Browse the repository at this point in the history
Loading