diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-05 00:03:30 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-05 00:03:30 -0400 |
| commit | 9c4fca446bdff87d7858fdbf52bb2bed7fb70960 (patch) | |
| tree | 0db8748c1bd090895906bd5d141c6f8da78bb849 /view/fake_feed.tpl | |
| parent | 9860d6b95ce1ac3d1ed6e4256df5874d06b9e2ea (diff) | |
| parent | 37801dd6ed60776fc128d44f0d63a57e1b5e37d0 (diff) | |
| download | volse-hubzilla-9c4fca446bdff87d7858fdbf52bb2bed7fb70960.tar.gz volse-hubzilla-9c4fca446bdff87d7858fdbf52bb2bed7fb70960.tar.bz2 volse-hubzilla-9c4fca446bdff87d7858fdbf52bb2bed7fb70960.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
also block outbound
let's catch d* disabled at a higher level and not waste any resources on it.
* master:
Diffstat (limited to 'view/fake_feed.tpl')
0 files changed, 0 insertions, 0 deletions