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
..
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 remote branch 'edavis/master' into master-journalized	2010-10-26 18:28:39 +02: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	move (almost) everything over to acts_as_journalized	2010-07-15 18:24:12 +02:00
routes.rb	Refactor: convert WikiController#destroy to use HTTP DELETE	2010-10-26 15:59:20 +00:00
settings.yml	Add a default mail notification setting for new users	2010-09-28 18:36:50 +00:00