Skip to content

Commit ee390e8

Browse files
committed
Merge branch 'develop' for v4.0.15
2 parents c83a4c3 + 8cedeb7 commit ee390e8

File tree

12 files changed

+181
-140
lines changed

12 files changed

+181
-140
lines changed

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# EasyEngine v4
21

3-
<img width="150" height="150" src="https://easyengine.io/wp-content/uploads/2015/11/cropped-favicon-easyengine.png" alt="EasyEngine Logo" align="right" />
2+
<img src="https://i2.wp.com/easyengine.io/wp-content/uploads/sites/20/2019/06/EasyEngine-New-Logo-Banner@2x-Transparent-Background.png?fit=720%2C170&ssl=1" alt="EasyEngine Logo" />
43

5-
[![Build Status](https://travis-ci.org/EasyEngine/easyengine.svg?branch=master-v4)](https://travis-ci.org/EasyEngine/easyengine)
6-
[![License](https://poser.pugx.org/phpunit/phpunit/license)](https://packagist.org/packages/phpunit/phpunit)
7-
[![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/)
4+
# EasyEngine v4 [![Build Status](https://travis-ci.org/EasyEngine/easyengine.svg?branch=master-v4)](https://travis-ci.org/EasyEngine/easyengine) [![License](https://poser.pugx.org/phpunit/phpunit/license)](https://packagist.org/packages/phpunit/phpunit) [![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/)
5+
6+
EasyEngine makes it greatly easy to manage nginx, a fast web-server software that consumes little memory when handling increasing volumes of concurrent users.
7+
8+
<a href="https://rtcamp.com/?utm_source=github&utm_medium=readme" rel="nofollow"><img src="https://rtcamp.com/wp-content/uploads/2019/04/[email protected]" alt="Handcrafted Enterprise WordPress Solutions by rtCamp" /></a>
89

910
## Requirements
1011

@@ -108,3 +109,5 @@ We warmheartedly welcome all contributions however and in whatever capacity you
108109
## Donations
109110

110111
[![PayPal-Donate](https://cloud.githubusercontent.com/assets/4115/5297691/c7b50292-7bd7-11e4-987b-2dc21069e756.png)](http://rt.cx/eedonate)
112+
113+

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.14
1+
4.0.15

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
"php": ">=7.0",
2828
"composer/composer": "1.7.3",
2929
"composer/semver": "1.4.2",
30-
"easyengine/admin-tools-command": "v1.0.8",
30+
"easyengine/admin-tools-command": "v1.0.9",
3131
"easyengine/auth-command": "v1.0.2",
3232
"easyengine/config-command": "v1.0.2",
3333
"easyengine/cron-command": "v1.0.2",
3434
"easyengine/log-command": "v1.0.1",
3535
"easyengine/mailhog-command": "v1.0.2",
36-
"easyengine/site-command": "v2.3.4",
37-
"easyengine/site-type-wp": "v1.0.10",
38-
"easyengine/site-type-php": "v1.0.10",
36+
"easyengine/site-command": "v2.4.0",
37+
"easyengine/site-type-wp": "v1.1.0",
38+
"easyengine/site-type-php": "v1.1.0",
3939
"easyengine/service-command": "v1.0.9",
4040
"easyengine/shell-command" : "v1.0.3",
4141
"justinrainbow/json-schema": "5.2.7",

0 commit comments

Comments
 (0)