Code merged from ship-simu repository

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 5fd7e66c5defffa58b5506e94c18c6086849a7ca..6288da63c88bea7369eac20cf9407babd90692ba 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -239,6 +239,8 @@ inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.ph
 inc/classes/main/actions/web/.htaccess -text
 inc/classes/main/actions/web/class_WebLoginLogoutAction.php -text
 inc/classes/main/actions/web/class_WebLoginProfileAction.php -text
+inc/classes/main/application/.htaccess -text
+inc/classes/main/application/class_BaseApplication.php -text
 inc/classes/main/auth/.htaccess -text
 inc/classes/main/auth/class_CookieAuth.php -text
 inc/classes/main/cache/.htaccess -text
@@ -253,6 +255,7 @@ inc/classes/main/commands/class_BaseCommand.php -text
 inc/classes/main/commands/image/.htaccess -text
 inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php -text
 inc/classes/main/commands/web/.htaccess -text
+inc/classes/main/commands/web/class_ -text
 inc/classes/main/commands/web/class_WebConfirmCommand.php -text
 inc/classes/main/commands/web/class_WebDoFormCommand.php -text
 inc/classes/main/commands/web/class_WebHomeCommand.php -text
@@ -284,6 +287,7 @@ inc/classes/main/controller/image/class_ImageDefaultController.php -text
 inc/classes/main/controller/login/.htaccess -text
 inc/classes/main/controller/login/class_WebLoginAreaController.php -text
 inc/classes/main/controller/web/.htaccess -text
+inc/classes/main/controller/web/class_ -text
 inc/classes/main/controller/web/class_WebConfirmController.php -text
 inc/classes/main/controller/web/class_WebDefaultController.php -text
 inc/classes/main/controller/web/class_WebDefaultNewsController.php -text
@@ -434,6 +438,7 @@ inc/classes/main/resolver/command/class_BaseCommandResolver.php -text
 inc/classes/main/resolver/command/image/.htaccess -text
 inc/classes/main/resolver/command/image/class_ImageCommandResolver.php -text
 inc/classes/main/resolver/command/web/.htaccess -text
+inc/classes/main/resolver/command/web/class_ -text
 inc/classes/main/resolver/command/web/class_WebCommandResolver.php -text
 inc/classes/main/resolver/controller/.htaccess -text
 inc/classes/main/resolver/controller/class_BaseControllerResolver.php -text
@@ -480,6 +485,8 @@ inc/classes/middleware/debug/class_DebugMiddleware.php -text
 inc/classes/middleware/io/.htaccess -text
 inc/classes/middleware/io/class_FileIoHandler.php -text
 inc/classes/third_party/.htaccess -text
+inc/classes/third_party/akismet/.htaccess -text
+inc/classes/third_party/akismet/akismet.class.php -text
 inc/classes/third_party/api/.htaccess -text
 inc/classes/third_party/api/primusportal/.htaccess -text
 inc/classes/third_party/api/primusportal/class_PrimeraApi.php -text