'assigned_admin' and 'userid' can now be NULL

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index f465bb57051d4b8c34c49055a5f1e220d95c4f61..df6f01f0e29655681a316885c31f98b2c03315b7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -61,6 +61,7 @@ DOCS/en/rewrite/.htaccess svneol=native#text/plain
 DOCS/en/rewrite/README.txt svneol=native#text/plain
 DOCS/en/task/README.txt svneol=native#text/plain
 DOCS/en/themes/README.txt svneol=native#text/plain
+DOCS/geoip_LICENSE.txt svneol=native#text/plain
 DOCS/tpl-validator.php svneol=native#text/plain
 /admin.php svneol=native#text/plain
 /agb.php svneol=native#text/plain
@@ -148,6 +149,7 @@ inc/extensions/ext-earning.php svneol=native#text/plain
 inc/extensions/ext-events.php svneol=native#text/plain
 inc/extensions/ext-forced.php svneol=native#text/plain
 inc/extensions/ext-funcoins.php svneol=native#text/plain
+inc/extensions/ext-geoip.php svneol=native#text/plain
 inc/extensions/ext-grade.php svneol=native#text/plain
 inc/extensions/ext-holiday.php svneol=native#text/plain
 inc/extensions/ext-html_mail.php svneol=native#text/plain
@@ -212,6 +214,7 @@ inc/filter/bonus_filter.php svneol=native#text/plain
 inc/filter/booking_filter.php svneol=native#text/plain
 inc/filter/cache_filter.php svneol=native#text/plain
 inc/filter/coupon_filter.php svneol=native#text/plain
+inc/filter/earning_filter.php svneol=native#text/plain
 inc/filter/forced_filter.php svneol=native#text/plain
 inc/filter/mediadata_filter.php svneol=native#text/plain
 inc/filter/online_filter.php svneol=native#text/plain
@@ -532,6 +535,8 @@ inc/modules/admin/what-list_coupon.php svneol=native#text/plain
 inc/modules/admin/what-list_doubler.php svneol=native#text/plain
 inc/modules/admin/what-list_email_max_rec.php svneol=native#text/plain
 inc/modules/admin/what-list_forced_ads.php svneol=native#text/plain
+inc/modules/admin/what-list_forced_campaigns.php svneol=native#text/plain
+inc/modules/admin/what-list_forced_costs.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_network_api_translation.php svneol=native#text/plain
@@ -650,6 +655,7 @@ inc/modules/member/what-booking.php svneol=native#text/plain
 inc/modules/member/what-cash_coupon.php svneol=native#text/plain
 inc/modules/member/what-categories.php svneol=native#text/plain
 inc/modules/member/what-doubler.php svneol=native#text/plain
+inc/modules/member/what-earning.php svneol=native#text/plain
 inc/modules/member/what-earnings.php svneol=native#text/plain
 inc/modules/member/what-guest.php svneol=native#text/plain
 inc/modules/member/what-holiday.php svneol=native#text/plain
@@ -1037,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
@@ -1524,6 +1531,7 @@ templates/de/html/ext/ext_earning.tpl svneol=native#text/plain
 templates/de/html/ext/ext_events.tpl svneol=native#text/plain
 templates/de/html/ext/ext_forced.tpl svneol=native#text/plain
 templates/de/html/ext/ext_funcoins.tpl svneol=native#text/plain
+templates/de/html/ext/ext_geoip.tpl svneol=native#text/plain
 templates/de/html/ext/ext_grade.tpl svneol=native#text/plain
 templates/de/html/ext/ext_holiday.tpl svneol=native#text/plain
 templates/de/html/ext/ext_html_mail.tpl svneol=native#text/plain
@@ -1878,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