Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/dragoonDorise/EmuDeck into dev
Browse files Browse the repository at this point in the history 
# Conflicts:
#	configs/shadps4/config.toml
  • Loading branch information
@dragoonDorise
dragoonDorise committed Dec 25, 2024
2 parents 3b5200f + ade9b59 commit 71497f6
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 71497f6

Please sign in to comment.