Sean Tilley 7dfa6299ec Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream ... Conflicts: Changelog.md		2012-11-07 21:04:52 -06:00
..
assets	Merge branch 'reshares_count_stream' of https://github.com/movilla/diaspora into movilla-reshares_count_stream	2012-11-07 21:04:52 -06:00
controllers	Remove posts#new action from Rails and related tests	2012-11-07 23:14:35 -02:00
helpers	Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false	2012-10-10 16:49:45 +02:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	Only include url to post for twitter when post exceeds maximum length or contains photos	2012-11-03 23:25:19 +02:00
presenters	don't error out if the root of a reshare of a reshare got deleted, fixes #3546	2012-10-24 19:51:31 +02:00
uploaders	Strip Beta Features	2012-09-11 21:52:53 -05:00
views	Remove posts#new action from Rails and related tests	2012-11-07 23:14:35 -02:00