diff options
| author | Valery Piashchynski <[email protected]> | 2020-12-08 18:31:30 +0300 |
|---|---|---|
| committer | Valery Piashchynski <[email protected]> | 2020-12-08 18:31:30 +0300 |
| commit | df31ff9cb4cc4bd696a63163c8b4c2661fc28a8d (patch) | |
| tree | ccdb5d1596938f23a36f7aa880a348f2ab3cbba8 /.gitignore | |
| parent | 196d97e697680340d2c535f6a782ac38216b320a (diff) | |
| parent | 95bcb4c3f390bebb91041db710dbb4bde994d2fe (diff) | |
Merge remote-tracking branch 'origin/master' into 2.0
# Conflicts:
# .github/workflows/ci-build.yml
# .gitignore
# Dockerfile
# Makefile
# bin/rr
# bors.toml
# cmd/rr/cmd/root.go
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -16,5 +16,10 @@ # Dependency directories (remove the comment below to include it) # vendor/ .idea +composer.lock +vendor vendor_php -builds
\ No newline at end of file +builds/ +tests/vendor/ +.rr-sample.yaml +psr-worker.php |