Jonne Haß 4eb98cd7dc Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile ... Conflicts: Changelog.md		2013-01-29 14:58:11 +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 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile	2013-01-29 14:58:11 +01:00
stylesheets	Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile	2013-01-29 14:58:11 +01:00
templates	Merge pull request #3880 from Ruxton/feature/oembed_providers	2013-01-25 07:50:24 -08:00