aspangaro c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan ...

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

2015-03-02 21:05:38 +01:00

..

standard

Merge remote-tracking branch 'Upstream/develop' into develop-loan

2015-03-02 21:05:38 +01: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 'Upstream/develop' into develop-loan

2015-03-02 21:05:38 +01:00