Florian Staudacher 0c5c17f5e2 fix regression in conversations causing an infinite recursion (fix #4715) ... (cherry picked from commit 5c059b2925) Conflicts: Changelog.md		2014-01-20 23:39:19 +02:00
..
assets	replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem	2014-01-16 23:23:30 +01:00
controllers	Merge pull request #4666 from jaywink/signup-form-error-redirect	2014-01-11 14:08:18 -08:00
helpers	Add actions to contacts/index.html page	2013-11-12 19:10:00 -08:00
mailers	update branding	2013-08-25 18:21:14 +02:00
models	fix regression in conversations causing an infinite recursion (fix #4715)	2014-01-20 23:39:19 +02:00
presenters	Merge pull request #4612 from diaspora/drop_spv_old_code	2013-12-11 07:41:51 -08:00
uploaders
views	update devise to 3.2	2014-01-15 12:59:59 +01:00
workers	update devise to 3.2	2014-01-15 12:59:59 +01:00