Merge remote-tracking branch 'origin/master'

PhilippvK · Jan 20, 2021 · ee8eea5 · ee8eea5
2 parents 19e5fd6 + c63235b
commit ee8eea5
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -86,3 +86,6 @@ buildNumber.properties
 .mvn/timing.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
+
+.DS_Store
+Thumbs.db
diff --git a/assets/res/AGolf/picture/Thumbs.db b/assets/res/AGolf/picture/Thumbs.db
diff --git a/assets/res/AGolf/picture/bg-lobby-multi-new.gif b/assets/res/AGolf/picture/bg-lobby-multi-new.gif
diff --git a/client/src/main/resources/picture/agolf/Thumbs.db b/client/src/main/resources/picture/agolf/Thumbs.db
diff --git a/client/src/main/resources/picture/agolf/bg-lobby-multi-new.gif b/client/src/main/resources/picture/agolf/bg-lobby-multi-new.gif
diff --git a/res/AGolf/picture/bg-lobby-multi-new.gif b/res/AGolf/picture/bg-lobby-multi-new.gif