diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
| commit | 98b96e45ababecb7554232787968f2f326f24e54 (patch) | |
| tree | 66e907ccc1acd2c667b57f5b5d0a8db34cbd288c /test/fixtures/warnings | |
| parent | 2f2bd7fe72f474b7177c751a2dc3af716622ba91 (diff) | |
| parent | ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc (diff) | |
| download | pleroma-98b96e45ababecb7554232787968f2f326f24e54.tar.gz pleroma-98b96e45ababecb7554232787968f2f326f24e54.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/fixtures/warnings')
| -rw-r--r-- | test/fixtures/warnings/otp_version/21.1 | 1 | ||||
| -rw-r--r-- | test/fixtures/warnings/otp_version/22.1 | 1 | ||||
| -rw-r--r-- | test/fixtures/warnings/otp_version/22.4 | 1 | ||||
| -rw-r--r-- | test/fixtures/warnings/otp_version/23.0 | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/test/fixtures/warnings/otp_version/21.1 b/test/fixtures/warnings/otp_version/21.1 new file mode 100644 index 000000000..90cd64c4f --- /dev/null +++ b/test/fixtures/warnings/otp_version/21.1 @@ -0,0 +1 @@ +21.1
\ No newline at end of file diff --git a/test/fixtures/warnings/otp_version/22.1 b/test/fixtures/warnings/otp_version/22.1 new file mode 100644 index 000000000..d9b314368 --- /dev/null +++ b/test/fixtures/warnings/otp_version/22.1 @@ -0,0 +1 @@ +22.1
\ No newline at end of file diff --git a/test/fixtures/warnings/otp_version/22.4 b/test/fixtures/warnings/otp_version/22.4 new file mode 100644 index 000000000..1da8ccd28 --- /dev/null +++ b/test/fixtures/warnings/otp_version/22.4 @@ -0,0 +1 @@ +22.4
\ No newline at end of file diff --git a/test/fixtures/warnings/otp_version/23.0 b/test/fixtures/warnings/otp_version/23.0 new file mode 100644 index 000000000..4266d8634 --- /dev/null +++ b/test/fixtures/warnings/otp_version/23.0 @@ -0,0 +1 @@ +23.0
\ No newline at end of file |