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

Merge branch 'hotfix/0.0.3.3' into develop

Browse source 
Conflicts:
	Changelog.md
	config/defaults.yml
This commit is contained in:
Jonne Haß 2013-03-11 21:24:56 +01:00
commit 33acc1f7a2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -25,6 +25,10 @@
* Show timestamp when hovering on comment time-ago string. [#4042](https://github.com/diaspora/diaspora/issues/4042)
* If sharing a post with photos to Facebook, always include URL to post [#3706](https://github.com/diaspora/diaspora/issues/3706)
# 0.0.3.3
* Switch Gemfile source to https to be compatible with bundler 1.3
# 0.0.3.2
* Fix XSS vulnerability in conversations#new [#4010](https://github.com/diaspora/diaspora/issues/4010)