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

..

controller

Merge branch '3.1.x' into 3.2.x

2016-07-17 22:09:53 +02:00

exception

[ticket/13645] Move the feeds to controllers

2015-08-23 22:36:10 +02:00

attachments_base.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

base.php

Merge branch '3.1.x' into 3.2.x

2016-07-17 22:09:53 +02:00

feed_interface.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

forum.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

forums.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

helper.php

Merge branch '3.1.x'

2015-08-28 17:34:50 +02:00

news.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

overall.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

post_base.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

topic_base.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

topic.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

topics_active.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00

topics.php

[ticket/13645] Proper OOP for feeds

2015-08-23 22:36:10 +02:00