Andrew Steinborn a65f720f9d Merge branch 'dev/1.1.0' into dev/3.0.0 ...

# Conflicts:
#	build.gradle

2021-06-07 15:32:52 -04:00

..

src

Merge branch 'dev/1.1.0' into dev/3.0.0

2021-06-07 15:32:52 -04:00

build.gradle

Bump to Caffeine 3

2021-06-06 08:09:42 -04:00