migrations ok
schema.php ok
Migration de la base de donnée + création table Places
fichier conf startups
Creation_migration_Tags
Ajout du model Startup
Ajout du controller Startups
creation modele
creation du controller
creation des views
Commit Create_migration_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
Merge branch 'master' of https://github.com/davydoe/digisquare

Conflicts:
	app/Config/Migration/1390328133_migration_event_tags.php
Resolution encorse et toujours de vos conneries !!
azerty