]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 2 Jun 2012 03:13:24 +0000 (23:13 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 2 Jun 2012 03:13:24 +0000 (23:13 -0400)
commit8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6
tree1f850dfb657ddf52a4bf7fe036f81a1d911cfb64
parentb1dacd6d838ecf75fe828279e57c2e7a866be22f
parent0165d5dd2c8b12a71395cc881910974ddcbaf3fa
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: