Merge branch 'develop'

docksal · Jan 20, 2017 · 3d0dd40 · 3d0dd40
2 parents 822489b + e0e0e26
commit 3d0dd40
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -6,8 +6,15 @@ This image(s) is part of the [Docksal](http://docksal.io) image library.
 
 ## Versions
 
-- `docksal/cli:stable` - PHP 5.6
-- `docksal/cli:php7` - PHP 7.0
+**Stable tags**
+
+- `1.0-php7`, `1.0`, `latest` - PHP 7.0
+- `1.0-php5` - PHP 5.6
+
+**Development tags**
+
+- `php7`, `edge` - PHP 7.0
+- `php5` - PHP 5.6
 
 ## Includes
 
@@ -18,7 +25,7 @@ This image(s) is part of the [Docksal](http://docksal.io) image library.
   - drush (6,7,8)
     - registry_rebuild
     - coder-8.x + phpcs
-  - drupal console
+  - drupal console launcher
   - wp-cli
 - ruby
   - ruby