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


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