Extension ext-user (sub-id tracking) continued:

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e36d72162205d671ea0437a0835f962bfb015656..85ea562c3493cf6f8613e2642d97ce948ba74d8c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -903,12 +903,14 @@ templates/de/emails/admin/admin_coupon_code.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon_purge.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon_purge_row.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_del_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_delete_mem_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_earning_added.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_earning_updated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_forced_ads.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_forced_costs.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_points_data.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_user_subids.tpl svneol=native#text/plain
@@ -1042,11 +1044,13 @@ templates/de/emails/member/member_coupon.tpl svneol=native#text/plain
 templates/de/emails/member/member_coupon_code.tpl svneol=native#text/plain
 templates/de/emails/member/member_del_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_links.tpl svneol=native#text/plain
+templates/de/emails/member/member_delete_mem_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_doubler.tpl svneol=native#text/plain
 templates/de/emails/member/member_earning_added.tpl svneol=native#text/plain
 templates/de/emails/member/member_earning_updated.tpl svneol=native#text/plain
+templates/de/emails/member/member_edit_mem_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_forced_campaign_pending_active.tpl svneol=native#text/plain
@@ -1338,6 +1342,8 @@ templates/de/html/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_transfer_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_user.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_user_subids.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_row.tpl svneol=native#text/plain
@@ -1406,6 +1412,8 @@ templates/de/html/admin/admin_edit_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_user_subids.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_archiv.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_archiv_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_nav_row.tpl svneol=native#text/plain