From: Roland Haeder Date: Thu, 26 Feb 2015 00:21:27 +0000 (+0100) Subject: Merge branch 'rewrites-nightly/type-hints-asserts' into nightly X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b45df82a27e01993e134e517ab8f319f33366bdf;p=quix0rs-gnu-social.git Merge branch 'rewrites-nightly/type-hints-asserts' into nightly Conflicts: plugins/Directory/actions/groupdirectory.php plugins/Directory/actions/userdirectory.php plugins/WebFinger/WebFingerPlugin.php Signed-off-by: Roland Haeder --- b45df82a27e01993e134e517ab8f319f33366bdf