diff options
author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2023-07-06 00:29:46 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-05 16:29:46 +0200 |
commit | 54331ff1364043630eaae020d6b56eb275eca9c1 (patch) | |
tree | da88cdf6a084b33263d79da9e53def0a76913db3 /settings.gradle.kts | |
parent | 0d284cf02fb68873212e5b394ebeb3509370cbfb (diff) | |
download | skyhanni-54331ff1364043630eaae020d6b56eb275eca9c1.tar.gz skyhanni-54331ff1364043630eaae020d6b56eb275eca9c1.tar.bz2 skyhanni-54331ff1364043630eaae020d6b56eb275eca9c1.zip |
Merge pull request #297
* actually made it work
* Merge branch 'beta' into outlines
* fixing up merge
* Merge branch 'beta' into outlines
* merge conflicts
Diffstat (limited to 'settings.gradle.kts')
0 files changed, 0 insertions, 0 deletions