diff --git a/docs/components/custom-apps/web-app/changelog.md b/docs/components/custom-apps/web-app/changelog.md index de91a65f7ba58221377d3ebd85af3c4c0c1fd197..12b4a62abc81c1cc6e7be59a2c1eab5791f7c1de 100644 --- a/docs/components/custom-apps/web-app/changelog.md +++ b/docs/components/custom-apps/web-app/changelog.md @@ -1,7 +1,10 @@ # Changelog +<<<<<<< HEAD  +======= +>>>>>>> 9cd8b6e... Add doc for changelog and contact pages In order to keep our users updated with the latest features developped and bugs that have been fixed, we implemented a changelog feature. The component retrieves from the dedicated [service](../../services/changelog.md) the changelog of each released version from the most recent to the oldest. diff --git a/docs/components/custom-apps/web-app/contact.md b/docs/components/custom-apps/web-app/contact.md index ad6cef8403544185a56f492b86f6975df6b227e7..1f3293b22005fb1510338a88b6a18605e4a903bb 100644 --- a/docs/components/custom-apps/web-app/contact.md +++ b/docs/components/custom-apps/web-app/contact.md @@ -1,7 +1,10 @@ # Contact +<<<<<<< HEAD  +======= +>>>>>>> 9cd8b6e... Add doc for changelog and contact pages The contact page allow a user to contact the support team through the [email](../../services/mailer.md) service. When a user is not logged in, he/she will need to fill some personal information (firstname, lastname, email) in order for the support team to be able to reply. In the case he/she is logged in the information will already be completed.