diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-16 13:28:22 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-16 13:28:22 -0400 |
| commit | a8c1cbc65592b58beb2042defa476acdd27fe8fd (patch) | |
| tree | 0476b132c4cb6dc74dae9cbf493db258610cc9e3 /view/contact_block.tpl | |
| parent | e21bf3341b89363207271d42e2d1163639b06d12 (diff) | |
| parent | 28f941193d75ca12f4cb2a38a1c60e60ad10f2a6 (diff) | |
| download | volse-hubzilla-a8c1cbc65592b58beb2042defa476acdd27fe8fd.tar.gz volse-hubzilla-a8c1cbc65592b58beb2042defa476acdd27fe8fd.tar.bz2 volse-hubzilla-a8c1cbc65592b58beb2042defa476acdd27fe8fd.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
syntax error from pasted text, remove ^M's
bug #335 network search broken after new ssl policy settings
whitespace
notification for disapora comments
* master:
Diffstat (limited to 'view/contact_block.tpl')
0 files changed, 0 insertions, 0 deletions