]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 040d146 5a7363b)
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)
* remotes/upstream/master:
  more ssl policy stuff
  allow force ssl on notifications

* master:


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