Theoretical working merge of mailid.php and mailid_top.php into mailid.php + a couple...

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 50cd70f0e6030160bb210fba7c402f7be5317205..4ce171147d102b307d2280b80c5d38001eac4f6b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -96,6 +96,7 @@ DOCS/tpl-validator.php svneol=native#text/plain
 /birthday_confirm.php svneol=native#text/plain
 /click.php svneol=native#text/plain
 /confirm.php svneol=native#text/plain
+/cron.php svneol=native#text/plain
 /css.php svneol=native#text/plain
 /debug.php svneol=native#text/plain
 /doubler.php svneol=native#text/plain
@@ -256,6 +257,7 @@ inc/filter/booking_filter.php svneol=native#text/plain
 inc/filter/cache_filter.php svneol=native#text/plain
 inc/filter/country_filter.php svneol=native#text/plain
 inc/filter/coupon_filter.php svneol=native#text/plain
+inc/filter/doubler_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
@@ -826,6 +828,8 @@ inc/phpmailer/language/phpmailer.lang-se.php svneol=native#text/plain
 inc/phpmailer/language/phpmailer.lang-tr.php svneol=native#text/plain
 inc/phpmailer/language/phpmailer.lang-zh.php svneol=native#text/plain
 inc/phpmailer/language/phpmailer.lang-zh_cn.php svneol=native#text/plain
+inc/phpmailer/phpdoc/media/banner.css svneol=native#text/css
+inc/phpmailer/phpdoc/media/stylesheet.css svneol=native#text/css
 inc/phpmailer/test/phpmailer_test.php svneol=native#text/plain
 inc/phpmailer/test/phpunit.php svneol=native#text/plain
 inc/phpmailer/test/test.png -text svneol=unset#image/png
@@ -868,7 +872,7 @@ inc/xml-functions.php svneol=native#text/plain
 /index.php svneol=native#text/plain
 /install.php svneol=native#text/plain
 /js.php svneol=native#text/plain
-js/.js svneol=native#text/plain
+js/.js svneol=native#text/javascript
 js/admin-common.js svneol=native#text/javascript
 js/admin-data.js svneol=native#text/javascript
 js/admin-network-query-api.js svneol=native#text/javascript