From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 5 Apr 2012 03:32:16 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=afe7f09b278bca546f606a6ce54707a853cddf47;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  correct some filer dialog weirdness caused by introduction of categories
  move alert box away from nav links
  log disabled requests
  fix config storage of booleans

* master:
---

afe7f09b278bca546f606a6ce54707a853cddf47