Deprecated config.php removed. Please wait for further commits with an included fall...

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index cac7c01828d3d0938c1daf3f2c212120b03e9d0e..e6403632b36a1c06948c411e3afc6a17a12bdaaa 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -92,7 +92,8 @@ inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
 inc/check-reset.php -text
 inc/config-functions.php -text
-inc/config.php -text
+inc/config-global.php -text
+inc/config-local.php.dist -text
 inc/databases.php -text
 inc/db/.htaccess -text
 inc/db/lib-mysql3.php -text
@@ -125,10 +126,12 @@ inc/extensions/ext-events.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
 inc/extensions/ext-iso3166.php -text
+inc/extensions/ext-lead.php -text
 inc/extensions/ext-logs.php -text
 inc/extensions/ext-mailid.php -text
 inc/extensions/ext-maintenance.php -text
 inc/extensions/ext-mediadata.php -text
+inc/extensions/ext-menu.php -text
 inc/extensions/ext-mods.php -text
 inc/extensions/ext-mydata.php -text
 inc/extensions/ext-network.php -text
@@ -260,6 +263,7 @@ inc/libs/user_functions.php -text
 inc/libs/wernis_functions.php -text
 inc/libs/yoomedia_functions.php -text
 inc/load_cache.php -text
+inc/load_config.php -text
 inc/load_extensions.php -text
 inc/loader/.htaccess -text
 inc/loader/load_cache-admin.php -text
@@ -416,9 +420,12 @@ inc/modules/admin/what-overview.php -text
 inc/modules/admin/what-payments.php -text
 inc/modules/admin/what-refbanner.php -text
 inc/modules/admin/what-repair_amenu.php -text
+inc/modules/admin/what-repair_amnu.php -text
 inc/modules/admin/what-repair_cats.php -text
 inc/modules/admin/what-repair_gmenu.php -text
+inc/modules/admin/what-repair_gmnu.php -text
 inc/modules/admin/what-repair_mmenu.php -text
+inc/modules/admin/what-repair_mmnu.php -text
 inc/modules/admin/what-send_bonus.php -text
 inc/modules/admin/what-send_newsletter.php -text
 inc/modules/admin/what-stats_mods.php -text
@@ -623,6 +630,7 @@ inc/stylesheet.php -text
 inc/weekly/.htaccess -text
 inc/weekly/weekly_ -text
 inc/weekly/weekly_surfbar.php -text
+inc/wrapper-functions.php -text
 /index.php -text
 /install.php -text
 install/menu-de.sql -text
@@ -1237,10 +1245,12 @@ templates/de/html/ext/ext_doubler.tpl -text
 templates/de/html/ext/ext_events.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
+templates/de/html/ext/ext_lead.tpl -text
 templates/de/html/ext/ext_logs.tpl -text
 templates/de/html/ext/ext_mailid.tpl -text
 templates/de/html/ext/ext_maintenance.tpl -text
 templates/de/html/ext/ext_mediadata.tpl -text
+templates/de/html/ext/ext_menu.tpl -text
 templates/de/html/ext/ext_mods.tpl -text
 templates/de/html/ext/ext_mydata.tpl -text
 templates/de/html/ext/ext_network.tpl -text