Jonne Haß fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more ... Conflicts: Changelog.md		2013-04-13 12:53:31 +02:00
..
images	Merge branch 'develop' into diaspora_with_sprites	2013-03-11 20:10:55 -03:00
javascripts	Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter	2013-04-13 03:49:40 -07:00
stylesheets	Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more	2013-04-13 12:53:31 +02:00
templates	Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views	2013-03-15 11:45:22 -07:00