Merge branch 'ada-lovelace' of ssh://git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe into ada-lovelace
This commit is contained in:
commit
c76cb8f804
@ -1,8 +1,11 @@
|
|||||||
---
|
---
|
||||||
title: 'Ada Lovelace, la codeuse de l’ombre'
|
title: 'Ada Lovelace, la codeuse de l’ombre'
|
||||||
date: '2023-02-02'
|
date: '2023-02-02'
|
||||||
|
<<<<<<< HEAD
|
||||||
eventDate: '2023-01-03'
|
eventDate: '2023-01-03'
|
||||||
eventTime: '14:00'
|
eventTime: '14:00'
|
||||||
|
=======
|
||||||
|
>>>>>>> cd6ea738f4640fa7403653199b2df54addbe2db6
|
||||||
author: 'Lucie Margaria'
|
author: 'Lucie Margaria'
|
||||||
type: 'news'
|
type: 'news'
|
||||||
illustration: '/images/posts/ada-lovelace.svg'
|
illustration: '/images/posts/ada-lovelace.svg'
|
||||||
|
Loading…
Reference in New Issue
Block a user