Romain Neutron 212b09afa2 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Permalink.php

2013-10-25 18:50:15 +02:00

..

account

Merge branch '3.8'

2013-10-03 15:29:22 +02:00

admin

Merge branch '3.8'

2013-10-15 19:11:39 +02:00

api/auth

Fix assets path

2013-08-17 17:12:57 +02:00

client

Merge branch '3.8'

2013-10-18 15:01:47 +02:00

common

Merge branch '3.8'

2013-10-21 19:05:37 +02:00

developers

Login page geonames plugin integration

2013-07-03 18:34:34 +02:00

geonames

Update templates filepaths

2012-07-24 13:12:25 +02:00

lightbox

Rebased, fixed minor bugs

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

login

Merge branch '3.8'

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

prod

Merge branch '3.8'

2013-10-25 18:50:15 +02:00

report

Merge branch '3.8'

2013-10-15 19:11:39 +02:00

setup

Merge branch '3.8'

2013-09-26 12:51:21 +02:00

thesaurus

Fix assets path

2013-08-17 17:12:57 +02:00

email-template.html.twig

Fix #1486 : Add 3 missing locales

2013-09-25 10:59:22 +02:00

overview.html.twig

Add swfobject

2013-08-17 17:12:58 +02:00