9 commits

Author	SHA1	Message	Date
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00
RebeccaStankus	8728640f60	Initial CR changes	2019-08-14 12:03:49 -07:00
Zach Fox	52c4d4fe69	better FAQ	2019-08-14 09:31:08 -07:00
Zach Fox	b7a3d82f0f	DEV-170: Increase the speed of the animation when clicking between tabs in Settings	2019-06-25 11:30:25 -07:00
Zach Fox	34def0fd6b	DEV-145: About screen for platform info	2019-06-18 11:09:15 -07:00
Zach Fox	1d2ed1985f	DEV-142 & DEV-140: Scrollbars in Your Profile and Settings	2019-06-17 12:35:45 -07:00
Zach Fox	6fed581452	DEV-128: Update settings screen with latest design	2019-06-12 14:22:02 -07:00
Zach Fox	7bdd3084e9	DEV-122: Add a developer menu in Settings	2019-06-11 12:56:14 -07:00
Zach Fox	314c04ab96	Simplified UI v1	2019-05-10 10:49:25 -07:00