diff options
author | vantezzen <hello@vantezzen.io> | 2019-09-19 14:50:30 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-09-19 14:50:30 +0200 |
commit | 9ff091e42153f20689e90b9ed6239c54c8d4db25 (patch) | |
tree | 8ca56d6adda9feac2b6fb67686313971b353f0aa | |
parent | Fix lint (diff) | |
parent | #60 Explicitly set upstream for pull bot (diff) | |
download | ferdium-app-9ff091e42153f20689e90b9ed6239c54c8d4db25.tar.gz ferdium-app-9ff091e42153f20689e90b9ed6239c54c8d4db25.tar.zst ferdium-app-9ff091e42153f20689e90b9ed6239c54c8d4db25.zip |
Merge branch 'master' of https://github.com/getferdi/ferdi
-rw-r--r-- | .github/pull.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000..edb4269b3 --- /dev/null +++ b/.github/pull.yml | |||
@@ -0,0 +1,4 @@ | |||
1 | version: "1" | ||
2 | rules: | ||
3 | - base: master | ||
4 | upstream: meetfranz/franz | ||