New extension added, minor fixes, new author added

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 5440dc26d10d548066c4d6d7b41a2157fecf9b0e..23ff93abc8ff9e13a6d342559722d39fdb8be27c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -106,6 +106,7 @@ inc/extensions/ext-bank.php -text
 inc/extensions/ext-beg.php -text
 inc/extensions/ext-birthday.php -text
 inc/extensions/ext-bonus.php -text
+inc/extensions/ext-booking.php -text
 inc/extensions/ext-cache.php -text
 inc/extensions/ext-country.php -text
 inc/extensions/ext-debug.php -text
@@ -113,6 +114,7 @@ inc/extensions/ext-demo.php -text
 inc/extensions/ext-doubler.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
+inc/extensions/ext-iso3166.php -text
 inc/extensions/ext-mailid.php -text
 inc/extensions/ext-maintenance.php -text
 inc/extensions/ext-mediadata.php -text
@@ -165,6 +167,7 @@ inc/language/bank_de.php -text
 inc/language/beg_de.php -text
 inc/language/birthday_de.php -text
 inc/language/bonus_de.php -text
+inc/language/booking_de.php -text
 inc/language/cache_de.php -text
 inc/language/country_de.php -text
 inc/language/de.php -text
@@ -208,6 +211,7 @@ inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
 inc/libs/beg_functions.php -text
 inc/libs/bonus_functions.php -text
+inc/libs/booking_functions.php -text
 inc/libs/cache_functions.php -text
 inc/libs/country_functions.php -text
 inc/libs/debug_functions.php -text
@@ -616,8 +620,10 @@ install/tables.sql -text
 /surfbar.php -text
 templates/.htaccess -text
 templates/de/.htaccess -text
+templates/de/emails/.htaccess -text
 templates/de/emails/add-points.tpl -text
 templates/de/emails/admin-del_links.tpl -text
+templates/de/emails/admin/.htaccess -text
 templates/de/emails/admin/admin_autopurge_del_mails.tpl -text
 templates/de/emails/admin/admin_autopurge_delete.tpl -text
 templates/de/emails/admin/admin_autopurge_inactive.tpl -text
@@ -659,7 +665,12 @@ templates/de/emails/admin/admin_surfbar_url_active_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl -text
 templates/de/emails/admin/admin_surfbar_url_confirmed.tpl -text
 templates/de/emails/admin/admin_surfbar_url_depleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/admin/admin_surfbar_url_reg.tpl -text
@@ -694,10 +705,12 @@ templates/de/emails/del-user.tpl -text
 templates/de/emails/del_sponsor.tpl -text
 templates/de/emails/done-admin.tpl -text
 templates/de/emails/done-member.tpl -text
+templates/de/emails/guest/.htaccess -text
 templates/de/emails/guest/guest_request_confirm.tpl -text
 templates/de/emails/header.tpl -text
 templates/de/emails/lock-user.tpl -text
 templates/de/emails/lock_sponsor.tpl -text
+templates/de/emails/member/.htaccess -text
 templates/de/emails/member/member_autopurge_delete.tpl -text
 templates/de/emails/member/member_autopurge_inactive.tpl -text
 templates/de/emails/member/member_autopurge_points.tpl -text
@@ -741,7 +754,12 @@ templates/de/emails/member/member_surfbar_url_active_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_active_stopped.tpl -text
 templates/de/emails/member/member_surfbar_url_confirmed.tpl -text
 templates/de/emails/member/member_surfbar_url_depleted.tpl -text
+templates/de/emails/member/member_surfbar_url_locked_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_locked_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_migrate.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/member/member_surfbar_url_reg.tpl -text
@@ -768,6 +786,7 @@ templates/de/emails/order-reject.tpl -text
 templates/de/emails/profile-updte.tpl -text
 templates/de/emails/register-admin.tpl -text
 templates/de/emails/register-member.tpl -text
+templates/de/emails/sponsor/.htaccess -text
 templates/de/emails/sponsor/sponsor_activate.tpl -text
 templates/de/emails/sponsor/sponsor_add_points.tpl -text
 templates/de/emails/sponsor/sponsor_change_data.tpl -text
@@ -1185,6 +1204,7 @@ templates/de/html/ext/ext_bank.tpl -text
 templates/de/html/ext/ext_beg.tpl -text
 templates/de/html/ext/ext_birthday.tpl -text
 templates/de/html/ext/ext_bonus.tpl -text
+templates/de/html/ext/ext_booking.tpl -text
 templates/de/html/ext/ext_cache.tpl -text
 templates/de/html/ext/ext_country.tpl -text
 templates/de/html/ext/ext_debug.tpl -text