]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 26 May 2012 23:39:34 +0000 (19:39 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 26 May 2012 23:39:34 +0000 (19:39 -0400)
commit24f5e6b3f3f1f29cce8923c38fbdfb24fa5ed5a5
treee65d7d352b5d0557a52d161d491ddee26154b040
parent040d1467f356eb7a5d940b9cd779eb735b401794
parent5a7363b248e51b93c401a84d1b99f33632c44711
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  more ssl policy stuff
  allow force ssl on notifications

* master: