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
..
mail_handler	Adds a 'no_permission_check' option to the MailHandler.	2009-12-19 14:08:48 +00:00
sample_plugin	convert more to acts_as_journalized	2010-07-15 21:10:05 +02:00
svn	Adds a user-agent to reposman (#6735).	2010-10-24 21:00:05 +00:00