'assigned_admin' and 'userid' can now be NULL

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 6f67363f55429663b1a917a042e2706758f2ab75..df6f01f0e29655681a316885c31f98b2c03315b7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1043,6 +1043,7 @@ templates/de/html/admin/admin_add_network_api_translation.tpl svneol=native#text
 templates/de/html/admin/admin_add_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_network_type.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_payment.tpl svneol=native#text/plain
+templates/de/html/admin/admin_add_payout.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_points.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_points_all.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_rallye.tpl svneol=native#text/plain
@@ -1885,6 +1886,8 @@ templates/de/html/removeip_level.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_row.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_table.tpl svneol=native#text/plain
 templates/de/html/select/.htaccess svneol=native#text/plain
+templates/de/html/select/select_admins_box.tpl svneol=native#text/plain
+templates/de/html/select/select_admins_option.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_ads_type_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_ads_type_option.tpl svneol=native#text/plain
 templates/de/html/select/select_network_box.tpl svneol=native#text/plain