diff --git a/.github/workflows/create-release-tag.yml b/.github/workflows/create-release-tag.yml new file mode 100644 index 00000000..e69de29b diff --git a/README.md b/README.md index 98dc6900..c0f0ca22 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,12 @@ This is a modest project with the aim of providing Editorial Denes that allows them to achieve an online presence. The development is iterative: firstly a minimal functionality website has been launched, but the plan is to improve and expanded it gradually. +## Sync with upstream + +`git fetch --no-tags upstream` + +`git merge upstream/main` + ## License The theme is available as open source under the terms of the [MIT License](https://github.com/alshedivat/al-folio/blob/main/LICENSE). diff --git a/_news/announcement_debat_escola_pensament.md b/_news/announcement_debat_escola_pensament.md index 92d6b257..263e471e 100644 --- a/_news/announcement_debat_escola_pensament.md +++ b/_news/announcement_debat_escola_pensament.md @@ -11,15 +11,17 @@ related_posts: false # El futur del lèxic tradicional valencià + Debat amb motiu de la publicació del llibre L'aportació de Ferrer Pastor a la lexicografia catalano-valenciana, d'Emili Casanova, publicat per editorial Denes. #### Intervenen: +