]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 16 Mar 2012 17:28:22 +0000 (13:28 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 16 Mar 2012 17:28:22 +0000 (13:28 -0400)
commita8c1cbc65592b58beb2042defa476acdd27fe8fd
tree0476b132c4cb6dc74dae9cbf493db258610cc9e3
parente21bf3341b89363207271d42e2d1163639b06d12
parent28f941193d75ca12f4cb2a38a1c60e60ad10f2a6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  syntax error from pasted text, remove ^M's
  bug #335 network search broken after new ssl policy settings
  whitespace
  notification for disapora comments

* master: