Editing of bank packages added (updating records not finished!)

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index f81ab98f4d231d019ce4cb81adbc84984ef8660c..78726980ab89e350c7adffe0a55f628e218a657b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -121,12 +121,14 @@ inc/extensions/ext-rewrite.php -text
 inc/extensions/ext-sponsor.php -text
 inc/extensions/ext-sql_patches.php -text
 inc/extensions/ext-support.php -text
+inc/extensions/ext-surfbar.php -text
 inc/extensions/ext-task.php -text
 inc/extensions/ext-theme.php -text
 inc/extensions/ext-top10.php -text
 inc/extensions/ext-transfer.php -text
 inc/extensions/ext-user.php -text
 inc/extensions/ext-wernis.php -text
+inc/extensions/ext-yoomedia.php -text
 inc/fatal_errors.php -text
 inc/footer.php -text
 inc/functions.php -text
@@ -275,6 +277,7 @@ inc/modules/admin/what-config_order.php -text
 inc/modules/admin/what-config_other.php -text
 inc/modules/admin/what-config_payouts.php -text
 inc/modules/admin/what-config_points.php -text
+inc/modules/admin/what-config_proxy.php -text
 inc/modules/admin/what-config_rallye_prices.php -text
 inc/modules/admin/what-config_refid.php -text
 inc/modules/admin/what-config_reg.php -text
@@ -464,6 +467,7 @@ inc/phpmailer/class.smtp.php -text
 inc/phpmailer/codeworxtech.html -text
 inc/phpmailer/docs/extending.html -text
 inc/phpmailer/docs/faq.html -text
+inc/phpmailer/docs/phpmailer_sm.gif -text
 inc/phpmailer/docs/pop3_article.txt -text
 inc/phpmailer/docs/use_gmail.txt -text
 inc/phpmailer/examples/contents.html -text
@@ -474,6 +478,10 @@ inc/phpmailer/examples/images/phpmailer_mini.gif -text
 inc/phpmailer/examples/index.html -text
 inc/phpmailer/examples/pop3_before_smtp_test.php -text
 inc/phpmailer/examples/test1.php -text
+inc/phpmailer/examples/test_gmail.php -text
+inc/phpmailer/examples/test_mail.php -text
+inc/phpmailer/examples/test_sendmail.php -text
+inc/phpmailer/examples/test_smtp.php -text
 inc/phpmailer/language/phpmailer.lang-br.php -text
 inc/phpmailer/language/phpmailer.lang-ca.php -text
 inc/phpmailer/language/phpmailer.lang-cz.php -text
@@ -487,7 +495,7 @@ inc/phpmailer/language/phpmailer.lang-fo.php -text
 inc/phpmailer/language/phpmailer.lang-fr.php -text
 inc/phpmailer/language/phpmailer.lang-hu.php -text
 inc/phpmailer/language/phpmailer.lang-it.php -text
-inc/phpmailer/language/phpmailer.lang-ja.php -text
+inc/phpmailer/language/phpmailer.lang-ja.php -text svneol=unset#unset
 inc/phpmailer/language/phpmailer.lang-nl.php -text
 inc/phpmailer/language/phpmailer.lang-no.php -text
 inc/phpmailer/language/phpmailer.lang-pl.php -text
@@ -758,6 +766,7 @@ templates/de/html/admin/admin_config_payouts_edit_row.tpl -text
 templates/de/html/admin/admin_config_payouts_row.tpl -text
 templates/de/html/admin/admin_config_point_settings.tpl -text
 templates/de/html/admin/admin_config_points.tpl -text
+templates/de/html/admin/admin_config_proxy.tpl -text
 templates/de/html/admin/admin_config_rallye_del.tpl -text
 templates/de/html/admin/admin_config_rallye_del_row.tpl -text
 templates/de/html/admin/admin_config_rallye_edit.tpl -text
@@ -798,6 +807,8 @@ templates/de/html/admin/admin_del_transfer_row.tpl -text
 templates/de/html/admin/admin_del_user.tpl -text
 templates/de/html/admin/admin_edit_admins.tpl -text
 templates/de/html/admin/admin_edit_admins_row.tpl -text
+templates/de/html/admin/admin_edit_bank_packages.tpl -text
+templates/de/html/admin/admin_edit_bank_packages_row.tpl -text
 templates/de/html/admin/admin_edit_cats.tpl -text
 templates/de/html/admin/admin_edit_cats_row.tpl -text
 templates/de/html/admin/admin_edit_email.tpl -text
@@ -1063,12 +1074,14 @@ templates/de/html/ext/ext_rewrite.tpl -text
 templates/de/html/ext/ext_sponsor.tpl -text
 templates/de/html/ext/ext_sql_patches.tpl -text
 templates/de/html/ext/ext_support.tpl -text
+templates/de/html/ext/ext_surfbar.tpl -text
 templates/de/html/ext/ext_task.tpl -text
 templates/de/html/ext/ext_theme.tpl -text
 templates/de/html/ext/ext_top10.tpl -text
 templates/de/html/ext/ext_transfer.tpl -text
 templates/de/html/ext/ext_user.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
+templates/de/html/ext/ext_yoomedia.tpl -text
 templates/de/html/fatal_footer.tpl -text
 templates/de/html/fatal_header.tpl -text
 templates/de/html/guest/.htaccess -text