From: mmn <mmn@hethane.se>
Date: Fri, 20 Nov 2015 17:46:53 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5d548d157fbf868ad07998316d546e0d208da9cc;p=quix0rs-gnu-social.git

Merge branch 'master' into 'master'

block check can't be done inside the same try-expression as Subscription::getSub…

…scription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.

See merge request !59
---

5d548d157fbf868ad07998316d546e0d208da9cc