Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	.gradle/6.9.2/executionHistory/executionHistory.lock
#	.gradle/6.9.2/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock

...

This commit is contained in:

Seraina

2022-03-16 12:08:16 +01:00

parent 06b44cc64c 2d057d5954

commit efb8363f38

24 changed files with 390 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

.gradle/buildOutputCleanup/outputFiles.bin Normal file

Binary file not shown.