Merge branch '2.0'

* 2.0: Preparing 2.6.1 release Swap port & host Preparing 2.6.0 release
AsgardCms · Sep 10, 2017 · 002da1d · 002da1d
2 parents cb0df01 + 17ddc9e
commit 002da1d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/Modules/Core/Foundation/AsgardCms.php b/Modules/Core/Foundation/AsgardCms.php
@@ -8,5 +8,5 @@ class AsgardCms
      * The AsgardCms version.
      * @var string
      */
-    const VERSION = '2.5.2';
+    const VERSION = '2.6.1';
 }
diff --git a/Modules/Core/changelog.yml b/Modules/Core/changelog.yml
@@ -1,6 +1,9 @@
 url: https://github.com/AsgardCms/Platform
 versions:
-    "2.x.x@unreleased":
+    "2.6.1":
+        changed:
+            - Fixing installation having 2x port in <code>.env</code>
+    "2.6.0":
         added:
             - Added an <code>AsgardCms</code> class containing the current cms version
     "2.5.2":

diff --git a/Modules/Translation/changelog.yml b/Modules/Translation/changelog.yml
@@ -1,6 +1,6 @@
 url: https://github.com/AsgardCms/Platform
 versions:
-    "2.x.x@unreleased":
+    "2.6.0":
         changed:
             - Refactored the Translation controller for clean code
     "2.5.1":

diff --git a/Modules/User/changelog.yml b/Modules/User/changelog.yml
@@ -1,6 +1,6 @@
 url: https://github.com/AsgardCms/Platform
 versions:
-    "2.x.x@unreleased":
+    "2.6.0":
         added:
             - New methods on the Sentinel Guard, <code>logout</code> and <code>loginUsingId</code>
     "2.5.0":

diff --git a/Modules/Workshop/changelog.yml b/Modules/Workshop/changelog.yml
@@ -1,6 +1,6 @@
 url: https://github.com/AsgardCms/Platform
 versions:
-    "2.x.x@unreleased":
+    "2.6.0@unreleased":
         changed:
             - Read core module version from the AsgardCms class other modules keep same logic (<code>version</code> key in <code>module.json</code>)
     "2.5.0":