resolve conflicts

MAINTAINERS

@@ -13,7 +13,12 @@ Rémy Boulanouar <admin@dblk.org> (@DblK)
 Sandro Santilli <strk@kbt.io> (@strk)
 Thibault Meyer <meyer.thibault@gmail.com> (@0xbaadf00d)
 Thomas Boerger <thomas@webhippie.de> (@tboerger)
+Patrick G <geek1011@outlook.com> (@geek1011)
+Antoine Girard <sapk@sapk.fr> (@sapk)
 Lauris Bukšis-Haberkorns <lauris@nix.lv> (@lafriks)
+Jonas Östanbäck <jonas.ostanback@gmail.com> (@cez81)
 David Schneiderbauer <dschneiderbauer@gmail.com> (@daviian)
 Peter Žeby <morlinest@gmail.com> (@morlinest)
+Matti Ranta <matti@mdranta.net> (@techknowlogick)
+Michael Lustfield <mtecknology@debian.org> (@MTecknology)
 Jonas Franz <info@jonasfranz.software> (@JonasFranzDEV)

content/features/cross-platform.en-us.md

@@ -4,6 +4,7 @@ title: "Cross-platform"
 weight: 10
 toc: false
 draft: false
+url: "en-us"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-device-desktop" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/cross-platform.nl-nl.md

@@ -4,6 +4,7 @@ title: "Cross-platform"
 weight: 10
 toc: false
 draft: false
+url: "nl-nl"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-device-desktop" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/cross-platform.pt-br.md

@@ -4,6 +4,7 @@ title: "Multi-plataforma"
 weight: 10
 toc: false
 draft: false
+url: "pt-br"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-device-desktop" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/cross-platform.zh-cn.md

@@ -4,6 +4,7 @@ title: "跨平台"
 weight: 10
 toc: false
 draft: false
+url: "zh-cn"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-device-desktop" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/cross-platform.zh-tw.md

@@ -4,6 +4,7 @@ title: "跨平台"
 weight: 10
 toc: false
 draft: false
+url: "zh-tw"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-device-desktop" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/easy-installation.en-us.md

@@ -4,6 +4,7 @@ title: "Easy to install"
 weight: 10
 toc: false
 draft: false
+url: "en-us"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-flame" viewBox="0 0 12 16" version="1.1" aria-hidden="true">

content/features/easy-installation.nl-nl.md

@@ -4,6 +4,7 @@ title: "Makkelijk te installeren"
 weight: 10
 toc: false
 draft: false
+url: "nl-nl"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-flame" viewBox="0 0 12 16" version="1.1" aria-hidden="true">

content/features/easy-installation.pt-br.md

@@ -4,6 +4,7 @@ title: "Fácil de instalar"
 weight: 10
 toc: false
 draft: false
+url: "pt-br"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-flame" viewBox="0 0 12 16" version="1.1" aria-hidden="true">

content/features/easy-installation.zh-cn.md

@@ -4,6 +4,7 @@ title: "易安装"
 weight: 10
 toc: false
 draft: false
+url: "zh-cn"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-flame" viewBox="0 0 12 16" version="1.1" aria-hidden="true">

content/features/easy-installation.zh-tw.md

@@ -4,6 +4,7 @@ title: "易安裝"
 weight: 10
 toc: false
 draft: false
+url: "zh-tw"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-flame" viewBox="0 0 12 16" version="1.1" aria-hidden="true">

content/features/lightweight.en-us.md

@@ -4,6 +4,7 @@ title: "Lightweight"
 weight: 10
 toc: false
 draft: false
+url: "en-us"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-rocket" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/lightweight.nl-nl.md

@@ -4,6 +4,7 @@ title: "Lichtgewicht"
 weight: 10
 toc: false
 draft: false
+url: "nl-nl"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-rocket" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/lightweight.pt-br.md

@@ -4,6 +4,7 @@ title: "Fácil de instalar"
 weight: 10
 toc: false
 draft: false
+url: "pt-br"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-rocket" viewBox="0 0 16 16" version="1.1" aria-hidden="true">

content/features/lightweight.zh-cn.md

@@ -4,6 +4,7 @@ title: "轻量级"
 weight: 10
 toc: false
 draft: false
+url: "zh-cn"
 ---
 
 <h3 class="subtitle is-3">

content/features/lightweight.zh-tw.md

@@ -4,6 +4,7 @@ title: "輕量級"
 weight: 10
 toc: false
 draft: false
+url: "zh-tw"
 ---
 
 <h3 class="subtitle is-3">

content/features/open-source.en-us.md

@@ -4,6 +4,7 @@ title: "Open Source"
 weight: 10
 toc: false
 draft: false
+url: "en-us"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-code" viewBox="0 0 14 16" version="1.1" aria-hidden="true">

content/features/open-source.nl-nl.md

@@ -4,6 +4,7 @@ title: "Open Source"
 weight: 10
 toc: false
 draft: false
+url: "nl-nl"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-code" viewBox="0 0 14 16" version="1.1" aria-hidden="true">

content/features/open-source.pt-br.md

@@ -4,6 +4,7 @@ title: "Código aberto"
 weight: 10
 toc: false
 draft: false
+url: "pt-br"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-code" viewBox="0 0 14 16" version="1.1" aria-hidden="true">

content/features/open-source.zh-cn.md

@@ -4,6 +4,7 @@ title: "开源化"
 weight: 10
 toc: false
 draft: false
+url: "zh-cn"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-code" viewBox="0 0 14 16" version="1.1" aria-hidden="true">

content/features/open-source.zh-tw.md

@@ -4,6 +4,7 @@ title: "開源化"
 weight: 10
 toc: false
 draft: false
+url: "zh-tw"
 ---
 <h3 class="subtitle is-3">
 	<svg class="octicon octicon-code" viewBox="0 0 14 16" version="1.1" aria-hidden="true">