Merge branch '2.0'

ezpublishlegacy · Jan 24, 2018 · dacf6b8 · dacf6b8
2 parents 08d76ca + f377975
commit dacf6b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "ezsystems/ezplatform",
     "description": "eZ Platform distribution",
     "homepage": "https://github.com/ezsystems/ezplatform",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "type": "project",
     "authors": [
         {

diff --git a/doc/docker/README.md b/doc/docker/README.md
@@ -106,7 +106,7 @@ After some 5-10 seconds you should be able to browse the site on `localhost:8080
 ### Behat and Selenium use
 
 *Docker-Compose setup for Behat use is provided and used internally to test eZ Platform, this can be combined with most
-setups, here shown in combination with production setup which is what you1'll typically need to test before pushing your
+setups, here shown in combination with production setup which is what you'll typically need to test before pushing your
 image to Docker Hub/Registry.*
 
 From root of your projects clone of this distribution, [setup composer auth.json](#composer) and execute the following: