Commit 948d9798 authored by Antoine Le Morvan's avatar Antoine Le Morvan
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   package.json
parents 55a83351 657deb0d
Pipeline #201022 failed with stage
in 12 seconds
......@@ -6,6 +6,7 @@ site:
keys:
google_analytics: 'UA-148169026-1'
content:
edit_url: '{web_url}/edit/{refname}/{path}'
sources:
- url: https://framagit.org/formatux/formatux-formatux.git
branches: master
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment