Romain Neutron 96ac795d8d Merge branch '3.8' ...

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/classes/Feed/Entry/Item.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php

2013-10-28 18:21:15 +01:00

..

Entities

Adress comments

2013-10-28 15:53:00 +01:00

Logger

Bump copyright year

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

Proxies

Restored proxies

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

Repositories

Merge branch '3.8'

2013-10-28 18:21:15 +01:00

Types

Bump copyright year

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