Added missing 'abort' element

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 10b9228454a3390b78a7e773186f4195bcd24d4d..813cd72c834e2d3fc6b603ac8e5ff03d7fc57119 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -148,6 +148,7 @@ inc/daily/daily_yoomedia.php svneol=native#text/plain
 inc/databases.php svneol=native#text/plain
 inc/db/.htaccess svneol=native#text/plain
 inc/db/lib-mysql3.php svneol=native#text/plain
+inc/db/lib-mysqli.php svneol=native#text/plain
 inc/db/lib.php svneol=native#text/plain
 inc/debug/.htaccess svneol=native#text/plain
 inc/debug/client/.htaccess svneol=native#text/plain
@@ -258,8 +259,12 @@ inc/extensions/ext-yacy.php svneol=native#text/plain
 inc/extensions/ext-yoomedia.php svneol=native#text/plain
 inc/extensions/forced/.htaccess svneol=native#text/plain
 inc/extensions/forced/mode-setup.php svneol=native#text/plain
+inc/extensions/grade/.htaccess svneol=native#text/plain
+inc/extensions/grade/mode-setup.php svneol=native#text/plain
 inc/extensions/holiday/.htaccess svneol=native#text/plain
 inc/extensions/holiday/mode-update.php svneol=native#text/plain
+inc/extensions/html_mail/.htaccess svneol=native#text/plain
+inc/extensions/html_mail/mode-update.php svneol=native#text/plain
 inc/extensions/network/.htaccess svneol=native#text/plain
 inc/extensions/network/mode-setup.php svneol=native#text/plain
 inc/extensions/order/.htaccess svneol=native#text/plain
@@ -647,6 +652,7 @@ inc/modules/admin/what-list_grade_data.php svneol=native#text/plain
 inc/modules/admin/what-list_holiday.php svneol=native#text/plain
 inc/modules/admin/what-list_links.php svneol=native#text/plain
 inc/modules/admin/what-list_mods.php svneol=native#text/plain
+inc/modules/admin/what-list_network_api.php svneol=native#text/plain
 inc/modules/admin/what-list_network_array_translation.php svneol=native#text/plain
 inc/modules/admin/what-list_network_data.php svneol=native#text/plain
 inc/modules/admin/what-list_network_request_params.php svneol=native#text/plain
@@ -1023,6 +1029,9 @@ templates/de/emails/admin/admin_sponsor_settings.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-ordr.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-reflink.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-unconfirmed.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_ordr.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_reflink.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_unconfirmed.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_depleted.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_pending.tpl svneol=native#text/plain
@@ -1147,6 +1156,9 @@ templates/de/emails/member/member_sub_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-ordr.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-reflink.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-unconfirmed.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_ordr.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_reflink.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_unconfirmed.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_low_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_url_active_deleted.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_url_active_pending.tpl svneol=native#text/plain
@@ -2134,6 +2146,8 @@ templates/de/html/select/select_forced_costs_id_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_costs_id_option.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_costs_visibility_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_costs_visibility_option.tpl svneol=native#text/plain
+templates/de/html/select/select_grade_parent_id_box.tpl svneol=native#text/plain
+templates/de/html/select/select_grade_parent_id_option.tpl svneol=native#text/plain
 templates/de/html/select/select_network_box.tpl svneol=native#text/plain
 templates/de/html/select/select_network_configured_box.tpl svneol=native#text/plain
 templates/de/html/select/select_network_configured_option.tpl svneol=native#text/plain
@@ -2243,6 +2257,7 @@ templates/xml/admin/admin_list_forced_ads.xml svneol=native#text/plain
 templates/xml/admin/admin_list_forced_campaigns.xml svneol=native#text/plain
 templates/xml/admin/admin_list_forced_costs.xml svneol=native#text/plain
 templates/xml/admin/admin_list_grade_data.xml svneol=native#text/plain
+templates/xml/admin/admin_list_network_api.xml svneol=native#text/plain
 templates/xml/admin/admin_list_network_query_api_config.xml svneol=native#text/plain
 templates/xml/admin/admin_list_nickname_history.xml svneol=native#text/plain
 templates/xml/admin/admin_list_point_accounts.xml svneol=native#text/plain