Skip to content

Commit dc722cd

Browse files
Merge branch 'master' into master
2 parents ae65503 + df4f86a commit dc722cd

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

in-the-news.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,24 @@ order: 5
1212

1313
<section class="spotlights">
1414

15+
<section>
16+
<a class="image">
17+
<img src="{% link assets/images/Morbidelli-2024-2025-Visuel.jpg %}" alt="" />
18+
</a>
19+
<div class="content">
20+
<div class="inner">
21+
<header class="major">
22+
<h3>Lecture series at the Collège de France by Alessandro Morbidelli</h3>
23+
</header>
24+
<p><b>October 23, 2024</b><br />
25+
The Collège de France will host a series of talks about the "Origin and evolution of the Solar System" by Alessandro Morbidelli (Observatoire de la Côte d'Azur, Collège de France). Eight talks will be given between October 23 and December 11, and will include three additional invited seminars.</p>
26+
<ul class="actions">
27+
<li><a href="https://www.college-de-france.fr/fr/agenda/cours/origine-et-evolution-du-systeme-solaire-externe" class="button">Learn more</a></li>
28+
</ul>
29+
</div>
30+
</div>
31+
</section>
32+
1533
<section>
1634
<a class="image">
1735
<img src="{% link assets/images/echantillon-lune-museum.jpeg %}" alt="" />

social-media.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ show-tile: true
99
order: 9
1010
---
1111

12-
### Mastodon and Bluesky
12+
## Mastodon and Bluesky
1313

14-
Ile-de-France Planets is on Mastodon and Bluesky! We post about planetary science events occurring in Ile-de-France, scientific discoveries made by researchers in our laboratories, and funding opportunities in Ile-de-France. If you would like to keep up to date with the planetary science activities in Ile-de-France, please consider following us.
14+
Ile-de-France Planets is on Mastodon and Bluesky! We post about planetary science events occurring in Ile-de-France, scientific discoveries made by researchers in our laboratories, and funding opportunities in Ile-de-France. If you would like to keep up to date with the planetary science activities in Ile-de-France, please consider following us:
1515

16-
Mastodon: <a href="https://solarsystem.social/@IDF_Planets">@IDF_Planets</a>
16+
* Mastodon: <a href="https://solarsystem.social/@IDF_Planets">@IDF_Planets@solarsystem.social</a>
1717

18-
Bluesky: <a href="https://bsky.app/profile/idf-planets.solarsystem.social">@idf-planets.solarsystem.social</a>
18+
* Bluesky: <a href="https://bsky.app/profile/idf-planets.solarsystem.social">@idf-planets.solarsystem.social</a>
1919

20-
If you would like an account on the free, decentralized Mastodon network, sign up on the planetary science community instance <a href="https://solarsystem.social/">solarsystem.social</a>.
20+
If you would like an account on the free, decentralized Mastodon network, sign up on the planetary science community instance <a href="https://solarsystem.social/">solarsystem.social</a>.
2121

22+
## Mattermost
2223

23-
### Mattermost
24+
If you are part of a community that is using Slack, please consider migrating to the Solar System Social Mattermost server. Mattermost is a free and open source team collaboration platform that is nearly identical to Slack. It doesn't suffer from any of the restrictions in the free Slack plan, and it is physically hosted using servers in France. Solar System Social will create a team for any early-career planetary science group or any planetary science community-led project. They will also create teams for other research projects on a case-by-case basis. If this interests you, please contact us on our social media accounts or by email.
2425

25-
If you are part of a community that is using Slack, please consider migrating to the Solar System Social Mattermost server. Mattermost is a free and open source team collaboration platform that is nearly identical to Slack. It doesn't suffer from any of the restrictions in the free Slack plan, and it is physically hosted using servers in France. Solar System Social will create a team for any early-career planetary science group or any planetary science community-led project. They will also create teams for other research projects on a case-by-case basis. If this interests you, please contact us on our social media accounts or by email.

0 commit comments

Comments
 (0)