Romain Neutron 762f758705 Merge branch '3.8' ...

Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/eventsmanager/notify/feed.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php

2013-10-24 14:05:04 +02:00

..

event

Bump copyright year

2013-01-21 23:28:58 +01:00

notify

Merge branch '3.8'

2013-10-24 14:05:04 +02:00

broker.php

Remove dead code

2013-09-04 12:14:50 +02:00

eventAbstract.php

Use composer as application autoloader

2013-01-18 17:47:25 +01:00

notifyAbstract.php

Merge branch '3.8'

2013-10-24 14:05:04 +02:00