[galette-commits] [GIT] galette/website.git branch develop updated. 1.0.1-6-gffadc3e

[<git@xxxxxxxxxxxxx>]

This is an automated email from git. It was generated because a ref
change was pushed to the "galette/website.git" repository.

The branch, develop has been updated
       via  ffadc3eb1fd2b365b9467c347f1154e2195d5a44 (commit)
       via  04fb612e5495eac7758f565da0a4f61e58550463 (commit)
       via  f2f54fdc655ae1e629511025fc704295c4a29aff (commit)
       via  012e586bd20b3a1ae761e962af4dbcc34cae6548 (commit)
      from  37297a9882e333a8db5cb616f79a299d75093e82 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ffadc3eb1fd2b365b9467c347f1154e2195d5a44
Merge: 37297a9 04fb612
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri May 29 10:19:40 2020 +0200

    Merge branch 'hotfix/1.0.2' into develop

commit 04fb612e5495eac7758f565da0a4f61e58550463
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri May 29 09:46:21 2020 +0200

    Move content not to be translated to common place and use include

commit f2f54fdc655ae1e629511025fc704295c4a29aff
Author: GruiicK <gruiick@xxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Fri May 29 09:26:53 2020 +0200

    ajout d'une fortune
    
    et test pour voir si tes smimleys unicode passent le md de github
    
    si tu valide, je push aussi dans [en]

-----------------------------------------------------------------------

Summary of changes:
 _i18n/en/pages/about.md                 | 193 +-------------------------------
 _i18n/fr/pages/about.md                 | 191 +------------------------------
 _includes/contents/fortunes.html        | 137 +++++++++++++++++++++++
 _includes/contents/foundation_mail.html |  39 +++++++
 _includes/contents/notthename.html      |  32 ++++++
 5 files changed, 215 insertions(+), 377 deletions(-)
 create mode 100644 _includes/contents/fortunes.html
 create mode 100644 _includes/contents/foundation_mail.html
 create mode 100644 _includes/contents/notthename.html


hooks/post-receive
-- 
galette/website.git

-- 
Galette repositories commits - http://galette.eu

List documentation: https://listengine.tuxfamily.org/lists.galette.eu/commits/