Jonne Haß 35ba082ab5 Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop ... Conflicts: Changelog.md		2013-02-17 15:48:34 +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	[WIP] aspect membership dropdown Backbone.js rework	2013-02-17 13:40:10 +01:00
stylesheets	Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop	2013-02-17 15:48:34 +01:00
templates	Hovering a Timeago-String should show the Timestamp	2013-01-31 13:43:37 -03:00