1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-03-03 14:52:36 +02:00

Merge branch 'docs_and_setup'

This commit is contained in:
Tim Möhlmann 2019-08-21 14:40:01 +03:00
commit 13d6cf2fdb
No known key found for this signature in database
GPG Key ID: 8677988D8072E8DE
3 changed files with 5 additions and 3 deletions

View File

@ -35,18 +35,18 @@ pull_request_rules:
comment:
message: bors r+
- name: Backport to 1.6 branch
- name: Backport to 1.7 branch
conditions:
- base=master
- label=type/backport
actions:
backport:
branches:
- '1.6'
- '1.7'
- name: remove outdated reviews
conditions:
- base~=^(master|1.6)$
- base~=^(master|1.7)$
actions:
dismiss_reviews:
approved: True

View File

@ -4,6 +4,7 @@ branches:
- testing
- '1.5'
- '1.6'
- '1.7'
- master
sudo: required

View File

@ -40,6 +40,7 @@ html_context = {
'versions': [
('1.5', '/1.5/'),
('1.6', '/1.6/'),
('1.7', '/1.7/'),
('master', '/master/')
],
'conf_py_path': '/docs/'