Jonne Haß b8128d356b Merge branch 'hotfix/0.0.2.4' into develop ... Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb		2013-02-01 22:24:37 +01:00
..
assets	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
controllers	Stream form on profile page	2013-01-31 00:15:27 -03:00
helpers	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	don't join the tags table here, it makes the query slower	2013-01-28 18:57:26 -02:00
presenters	bootstrap my_aspects data	2013-01-16 19:33:20 -02:00
uploaders	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
views	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00