diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-02 21:55:10 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-02 21:55:10 -0400 |
| commit | 06942b36549668eb067650831f286d96aab14a40 (patch) | |
| tree | 3955d7ec0947c1caf0c116a7c60daf8735e1bec5 /view/contact_edit.tpl | |
| parent | 9cb3fc226a9246b36810338f0ee8a115738cc97b (diff) | |
| parent | 9391fc965d68fea5fc18e93a1583e90d8f11bd02 (diff) | |
| download | volse-hubzilla-06942b36549668eb067650831f286d96aab14a40.tar.gz volse-hubzilla-06942b36549668eb067650831f286d96aab14a40.tar.bz2 volse-hubzilla-06942b36549668eb067650831f286d96aab14a40.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #363 and a couple of other reported ssl link issues
* master:
Diffstat (limited to 'view/contact_edit.tpl')
0 files changed, 0 insertions, 0 deletions