ChiliProject is not maintained anymore. Please be advised that there will be no more updates.

We do not recommend that you setup new ChiliProject instances and we urge all existing users to migrate their data to a maintained system, e.g. Redmine. We will provide a migration script later. In the meantime, you can use the instructions by Christian Daehn.

« Previous | Next » 

Revision 19c7dc00

ID: 19c7dc0094b67c17d5ad376ce67cd245116bb895
Added by Tim Felgentreff at 2010-10-26 06:28 pm

Merge remote branch 'edavis/master' into master-journalized

Conflicts:
app/controllers/application_controller.rb
app/controllers/wiki_controller.rb
app/helpers/issues_helper.rb
app/models/time_entry.rb
app/models/wiki_content.rb
app/views/wiki/edit.rhtml
config/locales/ja.yml
test/functional/wiki_controller_test.rb