Jonne Haß 4eb98cd7dc Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile ... Conflicts: Changelog.md		2013-01-29 14:58:11 +01:00
..
assets	Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile	2013-01-29 14:58:11 +01:00
controllers	add settings web mobile	2013-01-27 20:38:19 +01:00
helpers	bootstrap my_aspects data	2013-01-16 19:33:20 -02:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags	2012-11-25 09:30:47 -08: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 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile	2013-01-29 14:58:11 +01:00