Files
diaspora/config/initializers
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
..
2012-09-26 20:23:45 +02:00
2012-09-26 20:23:45 +02:00
2011-09-14 11:23:12 -07:00
2012-09-26 20:19:37 +02:00
2012-03-10 23:49:56 -08:00
2012-09-26 20:19:37 +02:00
2012-09-26 20:19:37 +02:00
2011-09-14 11:23:12 -07:00
2012-09-26 20:19:37 +02:00
2012-09-26 20:19:37 +02:00
2012-05-28 21:31:27 -07:00
2011-09-14 11:23:12 -07:00
2013-01-25 22:31:44 +08:00
2012-10-25 17:54:18 +02:00
2012-03-21 13:50:24 -07:00
2012-05-14 18:47:14 -07:00
2012-09-26 20:19:37 +02:00
2011-09-14 11:23:12 -07:00
2011-09-14 11:23:12 -07:00
2012-09-26 20:19:37 +02:00
2012-03-16 18:58:01 +01:00