Skip to content

Commit 9428a4b

Browse files
authored
Merge branch 'master' into mailparse
2 parents 9a0f9cf + 747cfaf commit 9428a4b

32 files changed

Lines changed: 1527 additions & 974 deletions

File tree

.github/FUNDING.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# DO NOT CHANGE THIS FILE PLEASE.
2+
3+
open_collective: laradock
4+
ko_fi: laradock
5+
issuehunt: laradock
6+
custom: ['beerpay.io/laradock/laradock', 'paypal.me/mzmmzz']

.github/README.md

Lines changed: 0 additions & 92 deletions
This file was deleted.
24 KB
Loading
128 KB
Loading

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929

3030
- PHP_VERSION=NA BUILD_SERVICE=solr
3131
- PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike"
32-
- PHP_VERSION=NA BUILD_SERVICE="blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
32+
- PHP_VERSION=NA BUILD_SERVICE="blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis cassandra"
3333
- PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin"
3434
- PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 haproxy"
3535
- PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server"

DOCUMENTATION/config.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ googleAnalytics = "UA-37514928-9"
2626
permalink = "#"
2727

2828
# Custom assets
29-
custom_css = []
29+
custom_css = ["custom-style.css"]
3030
custom_js = []
3131

3232
# Syntax highlighting theme
@@ -48,42 +48,42 @@ googleAnalytics = "UA-37514928-9"
4848
# ------- MENU START -----------------------------------------
4949

5050
[[menu.main]]
51-
name = "Introduction"
51+
name = "1. Introduction"
5252
url = "introduction/"
5353
weight = 1
5454

5555
[[menu.main]]
56-
name = "Getting Started"
56+
name = "2. Getting Started"
5757
url = "getting-started/"
5858
weight = 2
5959

6060
[[menu.main]]
61-
name = "Documentation"
61+
name = "3. Documentation"
6262
url = "documentation/"
6363
weight = 3
6464

6565
[[menu.main]]
66-
name = "Guides"
66+
name = "4. Guides"
6767
url = "guides/"
6868
weight = 4
6969

7070
[[menu.main]]
71-
name = "Help & Questions"
71+
name = "5. Help & Questions"
7272
url = "help/"
7373
weight = 5
7474

7575
[[menu.main]]
76-
name = "Related Projects"
76+
name = "6. Related Projects"
7777
url = "related-projects/"
7878
weight = 6
7979

8080
[[menu.main]]
81-
name = "Contributing"
81+
name = "7. Contributing"
8282
url = "contributing/"
8383
weight = 7
8484

8585
[[menu.main]]
86-
name = "License"
86+
name = "8. License"
8787
url = "license/"
8888
weight = 8
8989

DOCUMENTATION/content/contributing/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Contributing
2+
title: 7. Contributing
33
type: index
44
weight: 7
55
---

0 commit comments

Comments
 (0)