diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-01-28 18:09:44 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-01-28 18:09:44 +0300 |
| commit | 9eb5010e22607542a3227377a7d661b1198c57dd (patch) | |
| tree | 1ce01e02636b3e45948204e366dd8c3f09f4cdec /changelog | |
| parent | e481859bc404ffabcbb3c348f05587a59707c4a9 (diff) | |
| parent | 391a7c9202fc333600f7f60cf4f51db84516bc86 (diff) | |
Merge remote-tracking branch 'origin/2.7' into master
Diffstat (limited to 'changelog')
| -rw-r--r-- | changelog/2.7.5_2021-01-28/4363 (renamed from changelog/unreleased/4363) | 0 | ||||
| -rw-r--r-- | changelog/2.7.5_2021-01-28/8149 (renamed from changelog/unreleased/8149) | 0 | ||||
| -rw-r--r-- | changelog/2.7.5_2021-01-28/8314 (renamed from changelog/unreleased/8314) | 0 | ||||
| -rw-r--r-- | changelog/2.7.5_2021-01-28/8323 (renamed from changelog/unreleased/8323) | 0 | ||||
| -rw-r--r-- | changelog/2.7.5_2021-01-28/8326 (renamed from changelog/unreleased/8326) | 0 | ||||
| -rw-r--r-- | changelog/2.7.5_2021-01-28/8349 (renamed from changelog/unreleased/8349) | 0 | ||||
| -rw-r--r-- | changelog/2.7.5_2021-01-28/8390 (renamed from changelog/unreleased/8390) | 0 | ||||
| -rw-r--r-- | changelog/CHANGELOG.md | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/changelog/unreleased/4363 b/changelog/2.7.5_2021-01-28/4363 index 3d80037bf..3d80037bf 100644 --- a/changelog/unreleased/4363 +++ b/changelog/2.7.5_2021-01-28/4363 diff --git a/changelog/unreleased/8149 b/changelog/2.7.5_2021-01-28/8149 index 739a39132..739a39132 100644 --- a/changelog/unreleased/8149 +++ b/changelog/2.7.5_2021-01-28/8149 diff --git a/changelog/unreleased/8314 b/changelog/2.7.5_2021-01-28/8314 index 581cdc2b4..581cdc2b4 100644 --- a/changelog/unreleased/8314 +++ b/changelog/2.7.5_2021-01-28/8314 diff --git a/changelog/unreleased/8323 b/changelog/2.7.5_2021-01-28/8323 index f5124fd9b..f5124fd9b 100644 --- a/changelog/unreleased/8323 +++ b/changelog/2.7.5_2021-01-28/8323 diff --git a/changelog/unreleased/8326 b/changelog/2.7.5_2021-01-28/8326 index 61280310b..61280310b 100644 --- a/changelog/unreleased/8326 +++ b/changelog/2.7.5_2021-01-28/8326 diff --git a/changelog/unreleased/8349 b/changelog/2.7.5_2021-01-28/8349 index decde8322..decde8322 100644 --- a/changelog/unreleased/8349 +++ b/changelog/2.7.5_2021-01-28/8349 diff --git a/changelog/unreleased/8390 b/changelog/2.7.5_2021-01-28/8390 index fb3044764..fb3044764 100644 --- a/changelog/unreleased/8390 +++ b/changelog/2.7.5_2021-01-28/8390 diff --git a/changelog/CHANGELOG.md b/changelog/CHANGELOG.md deleted file mode 100644 index e69de29bb..000000000 --- a/changelog/CHANGELOG.md +++ /dev/null |