diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-25 13:47:20 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-25 13:47:20 -0400 |
| commit | 78280bdfed363f2316f1fa4e854e9604ebd58470 (patch) | |
| tree | 349bd483ccf265bef6216c041a4e4c3b587b357b /view/api_test_xml.tpl | |
| parent | 1a1efc7e4614a50a6221e17f0bb4ca48b6d38642 (diff) | |
| parent | c9e5609cbfd89db35b536a22eb2ce6cbf7992783 (diff) | |
| download | volse-hubzilla-78280bdfed363f2316f1fa4e854e9604ebd58470.tar.gz volse-hubzilla-78280bdfed363f2316f1fa4e854e9604ebd58470.tar.bz2 volse-hubzilla-78280bdfed363f2316f1fa4e854e9604ebd58470.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #307, explaining decentralised private photos is impossible.
this turns out to be harder than I thought
cleanup - make bb-buttons vanish when comment closed
Esperanto at 100% again
* master:
Diffstat (limited to 'view/api_test_xml.tpl')
0 files changed, 0 insertions, 0 deletions