diff options
| author | Jason Robinson <mail@jasonrobinson.me> | 2014-01-21 01:40:58 +0400 |
|---|---|---|
| committer | Jason Robinson <mail@jasonrobinson.me> | 2014-01-21 01:40:58 +0400 |
| commit | 590778502d1cf3b2a9a99bc74a6ac6b7a55aa59e (patch) | |
| tree | f8c4ae441edeaedfea1b0d2d9cffef2501c3507f /Changelog.md | |
| parent | 5c059b2925db882fadbd6b908e6706eb7fd5f379 (diff) | |
| parent | 7bfa7292faf99dba9d76a4397681cb4289749887 (diff) | |
Merge branch 'hotfix/0.3.0.1' into develop
Conflicts:
Changelog.md
config/defaults.yml
Diffstat (limited to 'Changelog.md')
| -rw-r--r-- | Changelog.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md index 2af63d5ba..0102c0fce 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,11 +4,15 @@ ## Bug fixes * Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280) -* Fix regression caused by using after_commit with nested '#save' which lead to an infinite recursion [#4715](https://github.com/diaspora/diaspora/issues/4715) ## Features * You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517) +# 0.3.0.1 + +## Bug fixes +* Fix regression caused by using after_commit with nested '#save' which lead to an infinite recursion [#4715](https://github.com/diaspora/diaspora/issues/4715) + # 0.3.0.0 ## Pod statistics |