Jonne Haß b8128d356b Merge branch 'hotfix/0.0.2.4' into develop ... Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb		2013-02-01 22:24:37 +01:00
..
images	Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment	2012-12-07 17:47:19 +01:00
javascripts	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
stylesheets	Stream form on profile page	2013-01-31 00:15:27 -03:00
templates	Hovering a Timeago-String should show the Timestamp	2013-01-31 13:43:37 -03:00