Merge remote-tracking branch 'origin/master' into master

Browse Source

# Conflicts:
#	README.md
#	build.gradle.kts
#	src/dorkbox/serializers/SerializationDefaults.kt

master

Robinson 2021-08-23 01:18:48 -06:00

parent 7a0f297e33 b199f0d7e0

commit 6b7ab93f6d

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

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

Diff Content Not Available