diaspora/app
Augier 2ce98b49d7 Fix issue #4416
Conflicts:
	spec/helpers/notifier_helper_spec.rb
2014-10-16 23:27:48 +02:00
..
assets Merge pull request #5342 from AugierLe42e/sass-to-scss 2014-10-14 19:42:31 +02:00
controllers Merge pull request #5276 from svbergerem/reshare-absolute-root 2014-10-14 19:40:35 +02:00
helpers Add a link to a reported comment in the admin panel 2014-10-13 14:11:51 +02:00
mailers Start converting IDN emails 2014-09-20 04:05:57 +02:00
models Fix issue #4416 2014-10-16 23:27:48 +02:00
presenters Merge pull request #5308 from Flaburgan/add-network-key-to-statistics 2014-10-14 13:25:16 +02:00
uploaders resize full scaled image to a specific width #3793 2013-01-26 11:36:01 +01:00
views Merge pull request #5318 from gdpelican/feature/fix-missing-password-translation 2014-10-14 13:17:57 +02:00
workers Handle already deleted items gracefully in receive local batch job 2014-09-20 15:26:31 +02:00