diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-26 19:39:34 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-26 19:39:34 -0400 |
| commit | 24f5e6b3f3f1f29cce8923c38fbdfb24fa5ed5a5 (patch) | |
| tree | e65d7d352b5d0557a52d161d491ddee26154b040 /view/api_user_xml.tpl | |
| parent | 040d1467f356eb7a5d940b9cd779eb735b401794 (diff) | |
| parent | 5a7363b248e51b93c401a84d1b99f33632c44711 (diff) | |
| download | volse-hubzilla-24f5e6b3f3f1f29cce8923c38fbdfb24fa5ed5a5.tar.gz volse-hubzilla-24f5e6b3f3f1f29cce8923c38fbdfb24fa5ed5a5.tar.bz2 volse-hubzilla-24f5e6b3f3f1f29cce8923c38fbdfb24fa5ed5a5.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
more ssl policy stuff
allow force ssl on notifications
* master:
Diffstat (limited to 'view/api_user_xml.tpl')
0 files changed, 0 insertions, 0 deletions