Merge

cfc999a0 · Maxime Kohlhaas · 8f72e164 · cfc999a0 · cfc999a0 · cfc999a0
Commit cfc999a0 authored 12 years ago by Maxime Kohlhaas
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
--- a/htdocs/includes/jquery/plugins/flot/Makefile
+++ b/htdocs/includes/jquery/plugins/flot/Makefile