Début
homecompleté
c bon c fais le jquery marche ;-) tu vas voir ton ereur c tu vas rire
amelioration imagine
change
mej
pierre
pierre
corectif
version entre deux
cool
Merge branch 'up'

Conflicts:
	app/Config/core.php
	app/Config/database.php.default
	app/Controller/AppController.php
	app/Controller/CmsController.php
	app/Controller/PagesController.php
	app/Model/Cm.php
	app/Model/Img.php
	app/View/Cms/admin_add.ctp
	app/View/Cms/admin_edit.ctp
	app/View/Cms/admin_index.ctp
	app/View/Cms/admin_view.ctp
	app/cms/base.json
	app/index.php

B
B
B
B