2 Commits

Author	SHA1	Message	Date
Joseph Donofry	3ff8b3ad8c	Merge master and fix conflicts	2021-01-11 17:51:39 -05:00
Joseph Donofry	1bc2db4bdf	Add Ripple effects to qml buttons and avatar	2021-01-11 17:50:26 -05:00