Extensions bitcoins/yacy added, new API functions for handling proxy/non-proxy added:

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index c55771879b30e705c6e692c47b8c5d96fe7519b9..6f9071e46e99b865eb562aa62dd5fa69a662a6ee 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -148,6 +148,7 @@ inc/extensions/ext-autoreg.php -text svneol=unset#text/plain
 inc/extensions/ext-bank.php -text svneol=unset#text/plain
 inc/extensions/ext-beg.php -text svneol=unset#text/plain
 inc/extensions/ext-birthday.php -text svneol=unset#text/plain
+inc/extensions/ext-bitcoins.php -text svneol=unset#text/plain
 inc/extensions/ext-bonus.php -text svneol=unset#text/plain
 inc/extensions/ext-booking.php -text svneol=unset#text/plain
 inc/extensions/ext-cache.php -text svneol=unset#text/plain
@@ -211,6 +212,7 @@ inc/extensions/ext-usage.php -text svneol=unset#text/plain
 inc/extensions/ext-user.php -text svneol=unset#text/plain
 inc/extensions/ext-validator.php -text svneol=unset#text/plain
 inc/extensions/ext-wernis.php -text svneol=unset#text/plain
+inc/extensions/ext-yacy.php -text svneol=unset#text/plain
 inc/extensions/ext-yoomedia.php -text svneol=unset#text/plain
 inc/filter-functions.php -text svneol=unset#text/plain
 inc/filters.php -text svneol=unset#text/plain
@@ -347,6 +349,7 @@ inc/loader/.htaccess -text svneol=unset#text/plain
 inc/loader/load- -text svneol=unset#text/plain
 inc/loader/load-admins.php -text svneol=unset#text/plain
 inc/loader/load-config.php -text svneol=unset#text/plain
+inc/loader/load-extension.php -text svneol=unset#text/plain
 inc/loader/load-extensions.php -text svneol=unset#text/plain
 inc/loader/load-filter.php -text svneol=unset#text/plain
 inc/loader/load-imprint.php -text svneol=unset#text/plain
@@ -1385,6 +1388,7 @@ templates/de/html/ext/ext_autoreg.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_bank.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_beg.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_birthday.tpl -text svneol=unset#text/plain
+templates/de/html/ext/ext_bitcoins.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_bonus.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_booking.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_cache.tpl -text svneol=unset#text/plain
@@ -1448,6 +1452,7 @@ templates/de/html/ext/ext_usage.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_user.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_validator.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_wernis.tpl -text svneol=unset#text/plain
+templates/de/html/ext/ext_yacy.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_yoomedia.tpl -text svneol=unset#text/plain
 templates/de/html/fatal_errors.tpl -text svneol=unset#text/plain
 templates/de/html/guest/.htaccess -text svneol=unset#text/plain