Laurent Destailleur f54946bacb Merge remote-tracking branch 'origin/4.0' into develop ...

Conflicts:
	htdocs/core/menus/init_menu_auguria.sql

2016-07-28 10:10:58 +02:00

..

standard

Merge remote-tracking branch 'origin/4.0' into develop

2016-07-27 19:04:55 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

init_menu_auguria.sql

Merge remote-tracking branch 'origin/4.0' into develop

2016-07-28 10:10:58 +02:00