Merge branch 'main' into staging

Merge branch '2024.6.1' into staging
Update linter rules
2024-07-25 15:24:01 +01:00 · 2024-07-24 15:26:11 +02:00 · 2024-07-18 15:42:56 +01:00
2 changed files with 2 additions and 2 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -35,7 +35,7 @@ module.exports = {
            4
        ],
        'linebreak-style': [
-            'error',
+            'off',  // git handles linebreak conversion for us
            'unix'
        ],
        'quotes': [
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -5,7 +5,7 @@
 ---
 services:
  cryptpad:
-    image: "cryptpad/cryptpad:version-2024.6.1"
+    image: "cryptpad/cryptpad:version-2024.6.0"
    hostname: cryptpad
    environment:
Author	SHA1	Message	Date
David Benque	ca8e58b34a	Merge branch 'main' into staging	2024-07-25 15:24:01 +01:00
yflory	5b08caede2	Merge branch '2024.6.1' into staging	2024-07-24 15:26:11 +02:00
David Benque	11cf84a985	Update linter rules Prevent line break errors on Windows	2024-07-18 15:42:56 +01:00