]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 17 Mar 2012 07:23:46 +0000 (03:23 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 17 Mar 2012 07:23:46 +0000 (03:23 -0400)
commitc7759af8c5375d3201b8185b61b6fc6feef98df0
treefb26adfc9fc61077033fa707fae24ba70ee9876a
parent057a142b8cd01cd8ab6212e9d958989c82dfccc3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  cut/paste error
  scheme checking for webservers without $_SERVER['HTTPS']

* master: