From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 2 Jun 2012 03:13:24 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6;p=friendica.git

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

* remotes/upstream/master:
  registration issue after re-factor
  install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
  admin: remove update link in admin menu

* master:
---

8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6