From cb0aeb81d77d7170196f1b667978f56c6018100b Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 25 Nov 2006 20:51:43 +0000
Subject: merge from 3.0 branch till 1508.

---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 3eed4a0d..89e7752e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2203,6 +2203,8 @@ tests/FunctionalTests/tickets/protected/pages/Ticket278.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket278.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket28.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket28.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket283.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket283.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket284.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket284.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket284Component.php -text
@@ -2212,6 +2214,7 @@ tests/FunctionalTests/tickets/protected/pages/Ticket306.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket311.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket312.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket351.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket453.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl -text
-- 
cgit v1.2.3