Jonne Haß f5a4bc51c2 Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop ... Conflicts: Changelog.md app/views/layouts/_header.html.haml		2013-05-18 20:03:59 +02:00
..
assets	fix mentions at the end of a post	2013-05-17 19:27:08 +02:00
controllers	Locator feature	2013-05-02 17:31:53 -05:00
helpers	Fix show more post in my activity mobile page. Close #4108	2013-04-08 00:04:42 +02:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	Locator feature	2013-05-02 17:31:53 -05:00
presenters	Locator feature	2013-05-02 17:31:53 -05:00
uploaders	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
views	Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop	2013-05-18 20:03:59 +02:00
workers	bump sidekiq	2013-04-25 21:30:35 +02:00