Jonne Haß fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more ... Conflicts: Changelog.md		2013-04-13 12:53:31 +02:00
..
assets	Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more	2013-04-13 12:53:31 +02:00
controllers	Always redirect user to downcase version of tags on UTF-8 encoding	2013-04-10 00:08:58 -03: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	Merge pull request #3993 from MrZYX/sidekiq	2013-04-03 15:19:15 -07:00
presenters	End the require mess	2013-03-21 23:37:53 +01:00
uploaders	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
views	Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more	2013-04-13 12:53:31 +02:00
workers	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00