Merge branch 'develop'

episerver · Apr 20, 2020 · 124daf4 · 124daf4
2 parents 0f4f183 + 2771c7f
commit 124daf4
Show file tree

Hide file tree

Showing 408 changed files with 1,227 additions and 7,132 deletions.
diff --git a/README.md b/README.md
@@ -5,14 +5,8 @@
 
 This repository is the starter site for the EPiServer Commerce reference implementation, aka "Quicksilver".
 
-Roadmap
--------------
-
-More features will be added over time.
-The following is a list of features to be added in the future:
-
-* In-store pickup.
-* Multi-payment support.
+We also offer "Foundation", a starting point that is intuitive, well-structured and modular allowing developers to select Episerver products as projects to include or exclude from their solution. Including as of now projects for CMS, Commerce, Personalization, Find and Social, with the rest to follow.
+You can refer to the Foundation project here: https://github.com/episerver/Foundation
 
 Installation
 ------------

diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs
@@ -3,6 +3,6 @@
 
 
 [assembly: AssemblyCopyright("Copyright ? 2020 Episerver")]
-[assembly: AssemblyVersion("13.15.0.0")]
-[assembly: AssemblyInformationalVersion("13.15.0")]
-[assembly: AssemblyFileVersion("13.15.0.3942")]
+[assembly: AssemblyVersion("13.18.1.0")]
+[assembly: AssemblyInformationalVersion("13.18.1")]
+[assembly: AssemblyFileVersion("13.18.1.4041")]
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_Data/log/placeholder.txt b/Sources/EPiServer.Reference.Commerce.Manager/App_Data/log/placeholder.txt
@@ -0,0 +1 @@
+This a default log file directory.