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

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

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

..

custom

Added some empty dirs

2011-12-07 18:10:57 +01:00

include

Merge branch '3.8'

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

scripts

Fix #1518 Can not edit tags in metadatas settings

2013-10-21 18:39:19 +02:00

skins

Merge branch '3.8'

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

.htaccess

Revert apache htaccess

2013-05-24 16:27:23 +02:00

api.php

Add error pages, fix error handling and PHP conf

2013-06-17 17:01:35 +02:00

crossdomain.xml

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

favicon.ico

initial import

2011-02-16 16:09:48 +01:00

index_dev.php

Add error pages, fix error handling and PHP conf

2013-06-17 17:01:35 +02:00

index.php

Add error pages, fix error handling and PHP conf

2013-06-17 17:01:35 +02:00