1. 250d84d Merge the two databases and the two Django projects. Note that the TKO migrations are still present, as is the migration code for TKO in database/migrate.py. These pieces of code are preserved because they are required by this change to perform the merge. A separate change will be submitted in the future to remove those references. by showard · 15 years ago
  2. 12b4558 Massive permission fix by lmr · 15 years ago
  3. eab66ce Rename the tables in the databases, by prefixing the app name. This is by showard · 15 years ago