Matthew Exon 4fcd882f02 Merge remote-tracking branch 'upstream/master' into retriever ...

Conflicts:
	retriever/view/help.tpl

2013-05-06 09:50:03 +08:00

..

templates

Merge remote-tracking branch 'upstream/master' into retriever

2013-05-06 09:50:03 +08:00

database.sql

Added retriever plugin

2013-04-03 20:13:08 +08:00

retriever.php

Reverse an earlier over-zealous check for a non-null value of the retriever. This prevented lots and lots of feed items coming through.

2013-05-06 08:43:42 +08:00