diff options
| author | xue <> | 2006-11-25 20:51:43 +0000 |
|---|---|---|
| committer | xue <> | 2006-11-25 20:51:43 +0000 |
| commit | cb0aeb81d77d7170196f1b667978f56c6018100b (patch) | |
| tree | 53deb6628356454d7e4348641135c84c1a909292 /.gitattributes | |
| parent | af340f68ef716b9a3c021a8cabc40068068bf3bf (diff) | |
merge from 3.0 branch till 1508.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
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 |