10 commits

Author	SHA1	Message	Date
Gabriel Calero	4a345a5559	Change default avatar name to Wooden Mannequin	2019-01-24 18:53:15 -03:00
Gabriel Calero	68feea23cb	Add the wooden mannequin as an eligible avatar	2019-01-24 16:21:38 -03:00
Gabriel Calero	618b27c952	Add missing json	2019-01-22 18:04:54 -03:00
Gabriel Calero	455d27aeb3	Fix merge	2019-01-22 16:18:00 -03:00
Gabriel Calero	f67d98f296	Merge remote-tracking branch 'upstream/master' into display_name_and_avatar	2019-01-22 14:17:52 -03:00
Brad Davis	a3e9ad9bc2	Revert target SDK to 26 due to splash screen bug: https://tinyurl.com/yb9ll4cd	2019-01-18 10:30:02 -08:00
Brad Davis	1879cd3b3c	Fixing repository order	2019-01-17 11:11:07 -08:00
Brad Davis	0bd6f9e26b	Fix JNI signature	2019-01-16 12:03:56 -08:00
Brad Davis	61ea0de742	Update build files based on move	2019-01-15 15:16:14 -08:00
Brad Davis	b11afa48f8	Move files to new location	2019-01-15 15:16:14 -08:00