]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1dacd6 0165d5d)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.