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

..

publish_edit.html.twig

Rebased, fixed minor bugs

2013-09-05 13:44:04 +02:00

publish.html.twig

Merge branch '3.8'

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