Skip to content
Snippets Groups Projects
Commit b491baa5 authored by ROULOIS Alexandre's avatar ROULOIS Alexandre :bicyclist:
Browse files

Merge branch 'main' into 'production'

Main

See merge request !37
parents b556e0f1 26ecfff4
No related branches found
No related tags found
1 merge request!37Main
......@@ -4,4 +4,4 @@ block content
h1.text-terracotta= title
p.lead
| CSSP 2023 will take place on 7-9 December 2023 (preceding a thematic workshop "Moral language" on 11 December 2023) at Ecole Normale Supérieure, Paris.
\ No newline at end of file
| CSSP 2023 will take place on 7-8 December 2023 (preceding a thematic workshop "Moral language" on 11 December 2023) at Ecole Normale Supérieure, Paris.
\ No newline at end of file
......@@ -104,7 +104,7 @@ block content
cite
| Australian apprehensive grams as scalar negative modals
li
| Kata Balogh & Rainer Osswald (Heinrich Heine Universität Düsseldorf )
| Kata Balogh, Rainer Osswald & Laura Kallmeyer (Heinrich Heine Universität Düsseldorf )
br
cite
| A novel representation of non-constituent focus and discontinuous focus
......
......@@ -4,4 +4,4 @@ block content
h1.text-terracotta= title
p.lead
| CSSP 2023 aura lieu les 7-9 décembre 2023 (avec, en plus, un workshop thématique "Langage moral" le 11 décembre 2023) à l'Ecole Normale Supérieure, Paris.
| CSSP 2023 aura lieu les 7-8 décembre 2023 (avec, en plus, un workshop thématique "Langage moral" le 11 décembre 2023) à l'Ecole Normale Supérieure, Paris.
......@@ -104,7 +104,7 @@ block content
cite
| Australian apprehensive grams as scalar negative modals
li
| Kata Balogh & Rainer Osswald (Heinrich Heine Universität Düsseldorf )
| Kata Balogh, Rainer Osswald & Laura Kallmeyer (Heinrich Heine Universität Düsseldorf )
br
cite
| A novel representation of non-constituent focus and discontinuous focus
......
......@@ -72,7 +72,7 @@ html
a.nav-link.text-terracotta(href="/program")!= t("NAV.PROG")
a.nav-link.text-terracotta(href="/thanks")!= t("NAV.THX")
a.nav-link.text-terracotta(href="/information")!= t("NAV.INFO")
a.nav-link.text-terracotta(href="/registration")!= t("NAV.REG")
a.nav-link.text-terracotta(href="https://cssp2023.sciencesconf.org/registration")!= t("NAV.REG")
a.nav-link.text-terracotta(href="/contact")!= t("NAV.CONTACT")
<!-- Logos -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment