2 Commits

Author	SHA1	Message	Date
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
Eric Davis	d5fde17bf5	Move all API tests into the ApiTest module to make management easier ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4357 e93f8b46-1217-0410-a6f0-8f06a7374b81	2010-11-01 15:26:05 +00:00