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

..

liquid

[#734] Don't modify text inline.

2011-11-26 16:10:24 +01:00

.empty

Create the ChiliProject namespace

2011-05-11 15:48:36 -07:00

compatibility.rb

Merge branch 'master' into unstable

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

database.rb

Set source encoding to UTF-8

2011-10-29 14:48:03 +02:00

liquid.rb

[#604] Add some handy filters

2011-11-20 02:49:21 +01:00

version.rb

Bump version to 2.5.0

2011-11-30 20:43:08 +01:00