Felix Schäfer 1d21cab2e4 Merge branch 'master' into unstable ...

Conflicts:
	app/views/projects/index.rhtml
	lib/chili_project/compatibility.rb

2011-12-01 17:46:05 +01:00

..

admin.rhtml

[#263] Allow setting the page header title

2011-08-05 10:45:48 -07:00

base.rhtml

Merge branch 'master' into unstable

2011-12-01 17:46:05 +01:00

help.html.erb

Introducing help layout

2011-05-02 14:32:50 +02:00

mailer.text.html.erb

[#340] Format blockquote tags in emails.

2011-05-15 23:42:39 +02:00

mailer.text.plain.erb

[#436] Remove trailing whitespace

2011-05-30 20:52:25 +02:00