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

..

exemplars

Set source encoding to UTF-8

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

fixtures

[#604] Adapt fixtures for new liquid syntax

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

functional

Merge branch 'master' into unstable

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

integration

Merge branch 'master' into unstable

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

mocks

Set source encoding to UTF-8

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

unit

Merge branch 'master' into unstable

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

helper_testcase.rb

Set source encoding to UTF-8

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

object_daddy_helpers.rb

Set source encoding to UTF-8

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

test_helper.rb

Set source encoding to UTF-8

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