Daniel Seifert 895b122b13 Merge commit 'dc434f4d423f861798ea9b91b12c8d10191f16ae' into dev_1.x ... # Conflicts: # docs/daux/changelog/010_Changelog.md # docs/daux/installation/010_Anforderungen/050_Vorbereitungen.md # docs/daux/installation/020_Neuinstallation/005_Vorbereitung.md # docs/daux/installation/020_Neuinstallation/080_Lizenz_eintragen.md # docs/daux/installation/020_Neuinstallation/090_Cronjob_einrichten.md # docs/daux/installation/030_Update/050_Shopanpassungen_installieren.md # docs/daux/installation/030_Update/070_Lizenzschluessel_aktualisieren.md # docs/daux/installation/040_Installationspruefung.md # docs/daux/installation/050_Schnellstart.md		2019-02-19 09:20:20 +01:00
..
changelog	add module specific contents to documentation	2019-02-19 09:16:16 +01:00
installation	Merge commit 'dc434f4d423f861798ea9b91b12c8d10191f16ae' into dev_1.x	2019-02-19 09:20:20 +01:00
support	Merge commit 'eb157813e53e87a698529363722f4bfc461d3399' as 'docs/daux'	2019-02-19 09:10:12 +01:00
_index.md	add module specific contents to documentation	2019-02-19 09:16:16 +01:00
config.json	Merge commit 'dc434f4d423f861798ea9b91b12c8d10191f16ae' into dev_1.x	2019-02-19 09:20:20 +01:00