Skip to content
  • Eric Davis's avatar
    Merge branch 'master' into unstable · cd64d11e
    Eric Davis authored
    Conflicts:
    	app/controllers/watchers_controller.rb
    	app/views/issues/_action_menu.rhtml
    	config/locales/pt-BR.yml
    	doc/CHANGELOG.rdoc
    	lib/redmine/export/pdf.rb
    	lib/redmine/wiki_formatting/textile/helper.rb
    cd64d11e