Changeset [a75d7b55cfe58f569d8c6e35bf46e7c42748b963] by dogmatic69
Revision a75d7b55cfe58f569d8c6e35bf46e7c42748b963,
committed by dogmatic69
· July 20th, 2011 @ 10:53 PM
Merge branch 'beta' of github.com:infinitas/infinitas into beta
Conflicts:
developer
https://github.com/infinitas/infinitas/commit/a75d7b55cfe58f569d8c6...
3 changed files
-
M
app_controller.php -
M
core/libs/controllers/components/infinitas.php -
M
core/routes/models/route.php