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
..
daux	Merge commit 'dc434f4d423f861798ea9b91b12c8d10191f16ae' into dev_1.x	2019-02-19 09:20:20 +01:00
install.sql	add documentation	2018-10-24 15:35:54 +02:00
update.sql	add documentation	2018-10-24 15:35:54 +02:00