Romain Neutron 2072f9e0e0 Merge branch '3.8' ...

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php

2013-11-08 19:04:26 +01:00

..

apps

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

common

Add city retrieval from geonamed id on input creation

2013-07-04 14:20:23 +02:00

models

Bind label field to backend

2013-05-31 19:41:01 +02:00

tests

Merge branch '3.8'

2013-11-08 19:04:26 +01:00