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
..
textile	Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652	2010-10-23 22:35:02 +00:00
macros.rb	completely remove acts_as_versioned as it's functionality is contained in acts_as_journalized	2010-08-04 19:01:18 +02:00