Merge remote-tracking branch 'upstream/develop' into 1610-performance
authorMichael Vogel <ike@pirati.ca>
Mon, 24 Oct 2016 08:12:13 +0000 (08:12 +0000)
committerMichael Vogel <ike@pirati.ca>
Mon, 24 Oct 2016 08:12:13 +0000 (08:12 +0000)
commit3463a442badb575f024a090f371d4f75c89d9b78
tree0ef0401d0114766820744ec6944c5b8205dec069
parent8cab3b55924f084261564636da9211e615bf52e8
parentcfea3cce7770fb518b408b84cc4ab7e8d6cb9116
Merge remote-tracking branch 'upstream/develop' into 1610-performance
include/Contact.php
mod/item.php