app/models/wiki_content.rb · 759313b18192c9c9e6632cda4c4ce96a93a6b094 · Projects / OHR Support

Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized · 859bfa62

Tim Felgentreff authored Nov 03, 2010

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

859bfa62

wiki_content.rb 3.57 KB

Replace wiki_content.rb