From 1cd5380675aab9a2884845b6630091be2e857f69 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 18 May 2006 21:26:25 +0000
Subject: Merge from 3.0 branch till 1082.

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 0c224241..51a4e35c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -123,6 +123,7 @@ demos/quickstart/protected/index/quickstart/deletable -text
 demos/quickstart/protected/index/quickstart/segments -text
 demos/quickstart/protected/pages/Advanced/Assets.page -text
 demos/quickstart/protected/pages/Advanced/Auth.page -text
+demos/quickstart/protected/pages/Advanced/Collections.page -text
 demos/quickstart/protected/pages/Advanced/Error.page -text
 demos/quickstart/protected/pages/Advanced/I18N.page -text
 demos/quickstart/protected/pages/Advanced/Logging.page -text
-- 
cgit v1.2.3