summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorxue <>2006-05-30 21:26:29 +0000
committerxue <>2006-05-30 21:26:29 +0000
commitb87fd00a62994d24a3708cec5f5613ed2e9a67ed (patch)
tree175dae5b58cdbeaf8d66898483c15974495ca3fc /.gitattributes
parent75f28186a995aa930f6db9f05ec7b63bbd2cd284 (diff)
merge from 3.0 branch till 1111.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index d046e8ab..08cd6622 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -78,6 +78,8 @@ demos/blog/protected/Portlets/ArchivePortlet.php -text
demos/blog/protected/Portlets/ArchivePortlet.tpl -text
demos/blog/protected/Portlets/CategoryPortlet.php -text
demos/blog/protected/Portlets/CategoryPortlet.tpl -text
+demos/blog/protected/Portlets/CommentPortlet.php -text
+demos/blog/protected/Portlets/CommentPortlet.tpl -text
demos/blog/protected/Portlets/LoginPortlet.php -text
demos/blog/protected/Portlets/LoginPortlet.tpl -text
demos/blog/protected/Portlets/Portlet.php -text