]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7759af 26258bc)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 00:03:34 +0000 (20:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 00:03:34 +0000 (20:03 -0400)
* remotes/upstream/master:
  compare ssl_policy precisely in case somebody was bitten by template processor bug
  template processor broken with foreach k=>v and k is integer 0

* master:


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