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
..
application_helper_spec.rb	bump rspec-rails and rspec	2013-01-17 02:00:03 +01:00
getting_started_helper_spec.rb
interim_stream_hackiness_helper_spec.rb
invitation_codes_helper_spec.rb
layout_helper_spec.rb	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
markdownify_helper_spec.rb	Do not strip "markdown" in links when posting to services, fix #3765	2012-11-26 14:16:43 +01:00
mobile_helper_spec.rb
notifications_helper_spec.rb
notifier_helper_spec.rb
o_embed_helper_spec.rb
people_helper_spec.rb
stream_helper_spec.rb
tags_helper_spec.rb