aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-28 09:10:57 +0200
committerChocobozzz <me@florianbigard.com>2021-05-28 09:10:57 +0200
commitd6d96bed80700830063c6055969d2d2ff46c63c6 (patch)
treed1fb4141ca788efaf2a54336e9a6a0df94c20ec6 /.gitlab-ci.yml
parent8f608a4cb22ab232cfab20665050764b38bac9c7 (diff)
parentb55e7127d1eb6f167e45db2a1ad00197355d1d2f (diff)
downloadPeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.tar.gz
PeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.tar.zst
PeerTube-d6d96bed80700830063c6055969d2d2ff46c63c6.zip
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff1ef245d..b02a2c4bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
1image: chocobozzz/peertube-ci:15 1image: chocobozzz/peertube-ci:14
2 2
3stages: 3stages:
4 - clients 4 - clients