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.
Revision 790bb362
ID: 790bb362c53633cc1b3faa4e7cb2afea287bed04
Fix the merge conflict from 6b8897db5fa5a