4 Commits

Author	SHA1	Message	Date
Jesse Boyd	5d8adbc10c	Merge remote-tracking branch 'upstream/master' into merge	2019-11-19 21:25:36 +00:00
MattBDev	da3019ae3d	More compile fixes and upstream mergesa	2019-10-09 16:15:26 -04:00
NotMyFault	714f8583f3	Update gradle	2019-09-14 01:54:39 +02:00
Jesse Boyd	4e49d16505	fix dependencies	2019-08-26 05:45:03 +01:00