diff options
| author | xue <> | 2006-05-18 21:26:25 +0000 |
|---|---|---|
| committer | xue <> | 2006-05-18 21:26:25 +0000 |
| commit | 1cd5380675aab9a2884845b6630091be2e857f69 (patch) | |
| tree | 31b4a1c97b769cb1505b1ec0706fe3f2dee9e715 /.gitattributes | |
| parent | 4945d1fb9856d92ab4dd9a0f65a11928f65f9b28 (diff) | |
Merge from 3.0 branch till 1082.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
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 |