5 commits

Author	SHA1	Message	Date
Matthew Exon	4fcd882f02	Merge remote-tracking branch 'upstream/master' into retriever ... Conflicts: retriever/view/help.tpl	2013-05-06 09:50:03 +08:00
Matthew Exon	c7878a0f78	Clarify the language of the help text a little	2013-05-06 09:47:06 +08:00
Matthew Exon	6667c9da6b	Reverse an earlier over-zealous check for a non-null value of the retriever. This prevented lots and lots of feed items coming through. ... Conflicts: retriever/retriever.php	2013-05-06 08:43:42 +08:00
fabrixxm	a85a080856	update addons template dir layout	2013-04-23 08:48:19 -04:00
Matthew Exon	0b82f146b5	Added retriever plugin	2013-04-03 20:13:08 +08:00