|
@@ -1,3 +1,4 @@
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
# LAMP Stack Cloudron App
|
|
# LAMP Stack Cloudron App
|
|
|
|
|
|
|
|
This repository contains the Cloudron app package source for a plain LAMP stack.
|
|
This repository contains the Cloudron app package source for a plain LAMP stack.
|
|
@@ -55,3 +56,6 @@ if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
|
|
|
* npm install
|
|
* npm install
|
|
|
* USERNAME=<> PASSWORD=<> mocha --bail test.js
|
|
* USERNAME=<> PASSWORD=<> mocha --bail test.js
|
|
|
|
|
|
|
|
|
|
+=======
|
|
|
|
|
+##lamp-app-alt
|
|
|
|
|
+>>>>>>> 39b1eaa419ecd3e928bb94a50c820c79da99acb4
|
deploy1