Tim Felgentreff 859bfa625d Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized ... Conflicts: app/models/wiki_content.rb app/views/wiki/history.rhtml config/locales/bg.yml config/locales/ca.yml config/locales/de.yml test/integration/api_test/projects_test.rb		2010-11-03 16:03:39 +01:00
..
environments	Add documentation about setting the log level. #6135	2010-09-26 16:54:38 +00:00
initializers	Workaround for i18n 0.4.x with the old style syntax. #6428 #5608	2010-09-26 17:13:52 +00:00
locales	Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized	2010-11-03 16:03:39 +01:00
additional_environment.rb.example	Allow a config/additional_environment.rb file to customize the Rails::Initializer.	2009-11-08 02:16:42 +00:00
boot.rb	Upgraded to Rails 2.3.4 (#3597)	2009-09-13 17:14:35 +00:00
database.yml.example	Cleanup and warning added in database.yml.database about the test database.	2010-03-12 13:48:14 +00:00
email.yml.example	Added some common example email configs to email.yml.example (#3120)	2010-02-18 05:20:52 +00:00
environment.rb	Fix journal_observer	2010-10-27 11:53:20 +02:00
routes.rb	Refactor: convert WikiController to a REST resource	2010-10-28 21:25:38 +00:00
settings.yml	Add a Email Header setting. Useful for adding delimiters to every email.	2010-11-02 19:00:36 +00:00