obsolete.ChilliProject/test
Tim Felgentreff 4b098d7774 Merge branch 'journals' into 1.0-stable
Conflicts:
	app/controllers/issues_controller.rb
	app/controllers/journals_controller.rb
	app/helpers/journals_helper.rb
	app/views/issues/_history.rhtml
	lib/redmine/activity/fetcher.rb
	test/functional/issues_controller_test.rb
	test/test_helper.rb
2010-09-14 09:32:35 +02:00
..
exemplars Merged r4010 from trunk. 2010-08-22 19:49:08 +00:00
fixtures Merge branch 'journals' into 1.0-stable 2010-09-14 09:32:35 +02:00
functional Merge branch 'journals' into 1.0-stable 2010-09-14 09:32:35 +02:00
integration Merge branch 'journals' into 1.0-stable 2010-09-14 09:32:35 +02:00
mocks Adding OpenID mock and test. #699 2009-02-11 19:07:18 +00:00
unit Merge branch 'journals' into 1.0-stable 2010-09-14 09:32:35 +02:00
helper_testcase.rb Upgraded to Rails 2.3.4 (#3597) 2009-09-13 17:14:35 +00:00
object_daddy_helpers.rb Updated object_daddy to a newer version (bugfixes) 2010-02-08 18:53:12 +00:00
test_helper.rb Merge branch 'journals' into 1.0-stable 2010-09-14 09:32:35 +02:00