Compare commits

...
Sign in to create a new pull request.

71 commits

Author SHA1 Message Date
c08bd65687
Merge branch 'trunk' 2026-09-09 17:57:31 +02:00
6fdcc5a20e
Merge branch 'develop' into trunk 2026-09-09 17:57:15 +02:00
a67956eeae
Merge branch 'trunk' 2026-09-09 17:44:25 +02:00
e24dfa1fb0
Merge branch 'develop' into trunk 2026-09-09 17:35:03 +02:00
Noah Lancien
1331d0ab83 Merge branch 'trunk' 2026-08-07 09:49:40 +02:00
Noah Lancien
8ff67da99d Merge branch 'develop' into trunk 2026-08-07 09:34:55 +02:00
Karl M'muller
9de1e4a9e2 Merge branch 'trunk' into 'master'
Trunk

See merge request ldc-web/projets/nature-and-respect!79
2026-08-04 07:19:23 +00:00
Noah Lancien
82527f6efd Merge branch 'develop' into trunk 2026-07-29 17:13:31 +02:00
Karl M'muller
01d12b2b25 Merge branch 'develop' into 'trunk'
Develop

See merge request ldc-web/projets/nature-and-respect!77
2026-07-29 12:38:51 +00:00
Noah Lancien
d8103a5436 Merge branch 'trunk' 2026-04-21 15:43:18 +02:00
Noah Lancien
a7538c23ff Merge branch 'develop' into trunk 2026-04-21 10:24:51 +02:00
Noah Lancien
988790f9cf Merge branch 'develop' into trunk 2026-04-21 10:10:07 +02:00
Noah Lancien
f7ae2fefc5 Merge branch 'trunk' 2026-01-14 11:19:06 +01:00
Noah Lancien
929368085a Merge branch 'develop' into trunk 2026-01-14 11:18:38 +01:00
Noah Lancien
26bba37435 Merge branch 'develop' into trunk 2026-01-09 10:18:11 +01:00
Karl
0f5b65a759 Merge branch 'trunk' 2025-07-24 10:38:43 +02:00
Karl
eec4263a9d Merge branch 'develop' into trunk 2025-07-24 10:38:23 +02:00
Karl
e571b34250 Merge branch 'trunk' 2025-07-21 11:06:59 +02:00
Karl
3bf3788d35 Merge branch 'develop' into trunk 2025-07-21 11:06:45 +02:00
System User
18759b47cf Merge branch 'trunk' 2025-07-18 17:39:27 +02:00
System User
72caf9b5c3 Merge branch 'develop' into trunk 2025-07-18 17:38:45 +02:00
System User
348161ee95 Merge branch 'trunk' 2025-07-18 17:29:02 +02:00
System User
777e1c6487 Merge branch 'develop' into trunk 2025-07-18 17:28:31 +02:00
System User
7315d01c6f Merge branch 'trunk' 2025-07-18 17:08:05 +02:00
System User
9854c03492 Merge branch 'develop' into trunk 2025-07-18 17:06:43 +02:00
System User
53c0419833 Merge branch 'trunk' 2025-07-18 16:19:08 +02:00
System User
27a6e1ac10 Merge branch 'develop' into trunk 2025-07-18 16:18:31 +02:00
System User
37d1888615 Merge branch 'trunk' 2025-07-18 13:04:25 +02:00
System User
f80238e9c2 Merge branch 'develop' into trunk 2025-07-18 12:55:13 +02:00
System User
5ea65ea215 Merge branch 'trunk' 2025-07-18 10:51:22 +02:00
System User
7d9aa34fea Merge branch 'develop' into trunk 2025-07-18 10:25:48 +02:00
System User
d00f11c86d Merge branch 'trunk' 2025-07-17 17:10:56 +02:00
System User
68c5d8090e Merge branch 'develop' into trunk 2025-07-17 17:10:25 +02:00
System User
49156d8f45 Merge branch 'trunk' 2025-07-17 12:53:47 +02:00
System User
4099252d03 Merge branch 'develop' into trunk 2025-07-17 12:53:13 +02:00
Noah Lancien
2aaed9c1c6 Merge branch 'trunk' 2025-07-16 16:58:08 +02:00
Noah Lancien
f4ae8f45d8 Merge branch 'develop' into trunk 2025-07-16 16:46:25 +02:00
Noah Lancien
e649ee7004 Merge branch 'trunk' 2025-07-16 16:29:34 +02:00
Noah Lancien
b6e8a54829 Merge branch 'develop' into trunk 2025-07-16 16:28:26 +02:00
Noah Lancien
7fdb067f32 Merge branch 'trunk' 2025-04-15 10:56:23 +02:00
Noah Lancien
32c9e9a588 Merge branch 'develop' into trunk 2025-04-08 17:28:33 +02:00
Karl Muller
84e6f956f7 Merge branch 'develop' into trunk 2025-04-02 14:39:26 +00:00
Noah Lancien
c8fcee5046 Merge branch 'trunk' 2025-03-24 11:14:26 +01:00
Noah Lancien
3342fd4908 Merge branch 'develop' into trunk 2025-02-26 15:26:35 +01:00
Karl Muller
6a692f2d3f Merge branch 'trunk' 2025-01-14 10:32:29 +00:00
Karl Muller
0328af97de Merge branch 'develop' into trunk 2025-01-14 10:26:49 +00:00
Noah Lancien
0f69407440 Merge branch 'trunk' 2024-11-18 10:23:12 +01:00
Noah Lancien
caa177304e Merge branch 'develop' into trunk 2024-11-14 09:18:23 +01:00
Thibault Raquet
037b083c07 Merge branch 'trunk' into 'master'
Trunk

See merge request ldc-web/projets/nature-and-respect!59
2024-08-23 13:55:31 +00:00
Thibault Raquet
d773b9529a Merge branch 'develop' into 'trunk'
Update production-resources.yaml

See merge request ldc-web/projets/nature-and-respect!58
2024-08-23 13:37:21 +00:00
Noah Lancien
4696609fe1 Merge branch 'develop' into trunk 2024-08-01 08:53:19 +02:00
Noah Lancien
9b1c813511 Merge branch 'trunk' 2024-07-16 18:48:02 +02:00
Noah Lancien
54e2c198bc Merge branch 'develop' into trunk 2024-07-16 18:47:42 +02:00
Noah Lancien
f45d4d910a Merge branch 'trunk' 2024-07-16 18:31:01 +02:00
Noah Lancien
582edf75a4 Merge branch 'develop' into trunk 2024-07-16 18:28:41 +02:00
Vincent BRIDIER
0c7f82e6bf Merge branch 'trunk' into 'master'
Trunk

See merge request ldc-web/projets/nature-and-respect!55
2024-07-05 13:30:24 +00:00
Vincent BRIDIER
cefb93d4e1 Merge branch 'develop' into 'trunk'
Develop

See merge request ldc-web/projets/nature-and-respect!54
2024-07-05 13:13:39 +00:00
Vincent BRIDIER
171c6420b7
Merge branch 'trunk' 2024-06-17 14:55:19 +02:00
Vincent BRIDIER
0c77524014
Merge branch 'trunk' 2024-06-13 14:55:24 +02:00
Vincent BRIDIER
be3983b2cd
Merge branch 'trunk' 2024-06-12 16:05:09 +02:00
Vincent BRIDIER
0befe59fd0
Merge branch 'trunk' 2023-12-12 12:30:18 +01:00
Vincent BRIDIER
6139490c73
Merge branch 'trunk' 2023-09-13 08:55:41 +02:00
Vincent BRIDIER
c904314e1e
merge branch trunk 2023-09-13 08:45:19 +02:00
Vincent BRIDIER
65b687ba3e
hotfix manifest 2023-07-05 08:53:43 +02:00
Vincent BRIDIER
d44d153ffb
hotfix htaccess 2023-07-05 08:53:04 +02:00
Vincent BRIDIER
d441ab806e hotfix translations 2023-06-15 16:30:48 +02:00
Vincent BRIDIER
2f4f081287
Merge branch 'trunk' 2023-06-05 11:12:32 +02:00
Vincent BRIDIER
3dbf2abba5
Merge branch 'trunk' 2023-06-02 13:22:32 +02:00
Vincent BRIDIER
b415f06ae0
Merge branch 'trunk' 2023-06-02 13:07:06 +02:00
Vincent BRIDIER
64f7d3c64c
Merge branch 'trunk' 2023-06-02 12:26:32 +02:00
Vincent BRIDIER
b2d4bb10fe
Merge branch 'trunk' 2023-05-10 12:23:57 +02:00

View file

@ -279,4 +279,4 @@
"Privacy Policy": "Datenschutzrichtlinie", "Privacy Policy": "Datenschutzrichtlinie",
"You must accept cookies :type to view the videos.": "Um die Videos ansehen zu können, müssen Sie :type-Cookies akzeptieren.", "You must accept cookies :type to view the videos.": "Um die Videos ansehen zu können, müssen Sie :type-Cookies akzeptieren.",
"The information collected from this form is processed by the Data Controller to follow up on your contact request. To know about your rights, you can consult :start the Privacy Policy :end": "Die in diesem Formular gesammelten Informationen werden vom Datenverantwortlichen verarbeitet, um Ihre Kontaktanfrage zu bearbeiten. Um mehr über Ihre Rechte zu erfahren, können Sie :start die Datenschutzrichtlinie einsehen:end" "The information collected from this form is processed by the Data Controller to follow up on your contact request. To know about your rights, you can consult :start the Privacy Policy :end": "Die in diesem Formular gesammelten Informationen werden vom Datenverantwortlichen verarbeitet, um Ihre Kontaktanfrage zu bearbeiten. Um mehr über Ihre Rechte zu erfahren, können Sie :start die Datenschutzrichtlinie einsehen:end"
} }