Eric Davis cd64d11e17 Merge branch 'master' into unstable ...

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

2011-05-27 12:20:04 -07:00

..

images

Updates zoom icons and removes unused ones.

2011-04-16 15:38:56 -07:00

javascripts

Merge branch 'master' into unstable

2011-05-27 12:20:04 -07:00

stylesheets

Removed the changeset-changes class to the commit logs on the issue view (#8038).

2011-04-16 16:13:20 -07:00

themes

[#202] Add the theme used on chiliproject.org

2011-05-27 09:18:48 -07:00

404.html

[#352] Use ChiliProject on error pages

2011-04-26 15:19:44 -07:00

422.html

[#196 #216 #216] Complete the upgrade to Rails 2.3.11

2011-05-06 15:44:38 -07:00

500.html

[#352] Use ChiliProject on error pages

2011-04-26 15:19:44 -07:00

dispatch.cgi.example

Changes ruby bang path to #!/usr/bin/env ruby (#1876).

2008-11-11 13:54:10 +00:00

dispatch.fcgi.example

Changes ruby bang path to #!/usr/bin/env ruby (#1876).

2008-11-11 13:54:10 +00:00

dispatch.rb.example

Changes ruby bang path to #!/usr/bin/env ruby (#1876).

2008-11-11 13:54:10 +00:00

favicon.ico

[#81] Add a favicon based on a Flickr image

2011-05-20 11:29:06 -07:00

htaccess.fcgi.example

Moves .htaccess to htaccess.fcgi.example (#7256).

2011-02-09 16:50:24 -08:00