Jonne Haß 9c7237ca1c Merge pull request #4244 from svbergerem/4237-consistent-conversation-list ... Show avatar of recent user in conversation list Conflicts: Changelog.md		2013-06-22 02:38:54 +02:00
..
assets	Remove alpha branding	2013-06-12 23:08:13 +02:00
controllers	Check for nil before splitting contact_ids param.	2013-06-15 17:14:30 -04:00
helpers	Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154	2013-06-20 00:06:13 +03:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	replace mentions of out-of-aspect people in limited posts with just a	2013-06-09 19:16:40 +02:00
presenters	show medium avatar in hovercard	2013-06-07 11:23:28 +02:00
uploaders	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
views	Show avatar of recent user in conversation list	2013-06-19 22:59:05 +02:00
workers	Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop	2013-05-25 13:50:28 +02:00