Michael 2a56370cf4 Merge remote-tracking branch 'upstream/develop' into annando/issue8514		2020-05-18 21:38:17 +00:00
..
duepuntozero	Normalize vcard across themes display after profile fields reorganization	2020-03-11 08:19:28 -04:00
frio	Issue 8514: Make paging for searcg items work again	2020-05-17 13:51:56 +00:00
quattro	Issue 8514: Make paging for searcg items work again	2020-05-17 13:51:56 +00:00
smoothly	Add Theme::getBackgroundColor and Theme::getThemeColor methods	2020-02-19 10:28:57 -05:00
vier	Issue 8582: "cid" in "network" is now "contactid"	2020-05-17 15:01:27 +00:00