diff options
| author | xue <> | 2006-05-18 18:12:39 +0000 |
|---|---|---|
| committer | xue <> | 2006-05-18 18:12:39 +0000 |
| commit | 4945d1fb9856d92ab4dd9a0f65a11928f65f9b28 (patch) | |
| tree | 2247b57f822f460b5858d9b0ceacbc73b927c5eb /.gitattributes | |
| parent | be6b0bb9061550aa6faadf47bf481b5f411c6188 (diff) | |
Merge from 3.0 branch till 1079.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index ac044898..0c224241 100644 --- a/.gitattributes +++ b/.gitattributes @@ -841,10 +841,12 @@ framework/I18N/schema/sqlite.sql -text framework/IO/TTarFileExtractor.php -text framework/IO/TTextWriter.php -text framework/PradoBase.php -text +framework/Security/IUserManager.php -text framework/Security/TAuthManager.php -text framework/Security/TAuthorizationRule.php -text framework/Security/TMembershipManager.php -text framework/Security/TSecurityManager.php -text +framework/Security/TUser.php -text framework/Security/TUserManager.php -text framework/TApplication.php -text framework/TApplicationComponent.php -text |