Jonne Haß 946121f672 Merge pull request #3827 from diasp/feature/1338-links-sidebar ... Show links in sidebar #1338		2013-01-26 04:09:22 -08: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	Oembed Update - Added instagram, better display for rich/photo	2013-01-22 22:37:36 +08:00
stylesheets	Merge pull request #3827 from diasp/feature/1338-links-sidebar	2013-01-26 04:09:22 -08:00
templates	Merge pull request #3880 from Ruxton/feature/oembed_providers	2013-01-25 07:50:24 -08:00