danielgrippi 750e26e8fb Merge branch 'stream-js-cleanup' ... Conflicts: public/javascripts/app/models/stream.js		2012-01-19 17:07:17 -08:00
..
controllers	SM MS; Read email sent to diaspora-dev for more information about this	2012-01-17 19:29:01 -08:00
helpers	update cdn jquery, fix #2699	2012-01-19 15:48:17 -08:00
mailers	refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471	2011-12-06 13:08:21 +01:00
models	fix #2698; allow a user to delete a reshare of a deleted post	2012-01-19 15:24:07 -08:00
uploaders	added support for uploading images with .tiff extensions	2012-01-02 21:40:46 -05:00
views	fix inf scroll issues in stream view	2012-01-19 17:01:45 -08:00