Tim Felgentreff 19c7dc0094 Merge remote branch 'edavis/master' into master-journalized ...

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/wiki_controller.rb
	app/helpers/issues_helper.rb
	app/models/time_entry.rb
	app/models/wiki_content.rb
	app/views/wiki/edit.rhtml
	config/locales/ja.yml
	test/functional/wiki_controller_test.rb

2010-10-26 18:28:39 +02:00

..

CHANGELOG

Merge branch 'master' into master-journalized

2010-10-26 18:20:57 +02:00

COPYING

Slight changes for 0.6.0 release.

2007-11-04 13:19:42 +00:00

git.rdoc

Add documentation about contributing to Redmine with git

2010-10-22 17:18:11 +00:00

INSTALL

Merged r3848 from trunk.

2010-07-18 15:53:51 +00:00

README_FOR_APP

Added doc/README_FOR_APP so RDoc can be built. (#1769)

2008-08-11 20:49:52 +00:00

RUNNING_TESTS

Added some tests for the LDAP authentication.

2010-02-16 16:40:50 +00:00

UPGRADING

Merged r3848 from trunk.

2010-07-18 15:53:51 +00:00