4 Commits

Author	SHA1	Message	Date
Marc Alexander	e7ce7ecbe7	Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/config/feed.yml phpBB/feed.php phpBB/phpbb/feed/base.php	2016-07-17 22:09:53 +02:00
Tristan Darricau	c9ec16f614	[ticket/13645] Fix docblocks ... PHPBB3-13645	2015-08-24 03:24:26 +02:00
Tristan Darricau	5df9a45473	[ticket/13645] Proper OOP for feeds ... PHPBB3-13645	2015-08-23 22:36:10 +02:00
Nicofuma	8e5e954438	[ticket/13645] Move the feeds to controllers ... PHPBB3-13645	2015-08-23 22:36:10 +02:00