nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/0.0.3.1' into develop

Browse source 
Conflicts:
	Changelog.md
	config/defaults.yml
This commit is contained in:
Jonne Haß 2013-02-24 17:26:45 +01:00
commit 3c9ce435e1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -9,7 +9,7 @@
* Deleting a post that was shared to Facebook now deletes it from Facebook too [#3980]( https://github.com/diaspora/diaspora/pull/3980) * Deleting a post that was shared to Facebook now deletes it from Facebook too [#3980]( https://github.com/diaspora/diaspora/pull/3980)
* Include reshares in a users public atom feed [#1781](https://github.com/diaspora/diaspora/issues/1781) * Include reshares in a users public atom feed [#1781](https://github.com/diaspora/diaspora/issues/1781)
## Bug Fixes # 0.0.3.1
* exec foreman in ./script/server to replace the process so that we can Ctrl+C it again. * exec foreman in ./script/server to replace the process so that we can Ctrl+C it again.
* Include our custom fileuploader on the mobile site too. [#3994](https://github.com/diaspora/diaspora/pull/3994) * Include our custom fileuploader on the mobile site too. [#3994](https://github.com/diaspora/diaspora/pull/3994)