Daniel Seifert 80f60153b4 Merge commit '1af93d170de286d930e79d93e0b0b22cf4c5ca5e' into dev_4.x_OXID63 ... # Conflicts: # docs/daux/config.json # docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md # docs/daux/installation/010_Anforderungen/030_Kompatibilitaet_mit_anderen_Modulen.md # docs/daux/installation/020_Neuinstallation/020_Modul_hinzufuegen.md # docs/daux/installation/020_Neuinstallation/030_Verwendung_eigener_Themes.md # docs/daux/installation/020_Neuinstallation/080_Lizenz_eintragen.md # docs/daux/installation/030_Update/020_Dateien_erneuern.md # docs/daux/installation/030_Update/070_Lizenzschluessel_aktualisieren.md		2021-07-20 10:25:03 +02:00
..
assets	Add Einrichtungsleitfaden Google Analytics	2020-05-20 11:00:17 +02:00
changelog	update version informations	2021-07-20 10:18:11 +02:00
installation	Merge commit '1af93d170de286d930e79d93e0b0b22cf4c5ca5e' into dev_4.x_OXID63	2021-07-20 10:25:03 +02:00
manual	fix documentation structure	2020-07-28 11:43:35 +02:00
support	Merge commit '8a38c8464f15f8f3ec3e076896295b58b16dbc71' as 'docs/daux'	2020-05-18 16:04:57 +02:00
_index.md	Merge commit '8a38c8464f15f8f3ec3e076896295b58b16dbc71' as 'docs/daux'	2020-05-18 16:04:57 +02:00
config.json	Merge commit '1af93d170de286d930e79d93e0b0b22cf4c5ca5e' into dev_4.x_OXID63	2021-07-20 10:25:03 +02:00