CRUD contracts
lunes 17 marzo
Lunes
Login Social Menu
Set as class working directory    .
Merge branch 'master' of https://github.com/agustincl/wpzf2

Conflicts:
	.gitignore
	composer.json
	config/application.config.php
	config/autoload/local.php
	config/autoload/local.php.dist
	module/Album/config/menu.config.php
	module/Album/view/album/index/index.phtml
	module/Application/config/menu.config.php
	module/Application/config/module.config.php
	module/Application/view/layout/layout.phtml
	module/Project/Module.php
	module/Project/config/module.config.php
	module/Project/language/en_US.po
	module/Project/language/es_ES.po
	module/Project/src/Project/Controller/IndexController.php
	module/Project/src/Project/Form/ProjectForm.php
	module/Project/src/Project/Model/Project.php
	module/Project/src/Project/Model/ProjectTable.php
	module/Project/test/Bootstrap.php
	module/Project/test/ProjectTest/Controller/IndexControllerTest.php
	module/Project/test/ProjectTest/Model/ProjectTableTest.php
	module/Project/test/ProjectTest/Model/ProjectTest.php
	module/Project/test/TestConfig.php
	module/Project/test/phpunit.xml
	module/Project/view/layout/backend.phtml
	module/Project/view/layout/layout.phtml
	module/Project/view/layout/login.phtml
	module/Project/view/partial/content.phtml
	module/Project/view/partial/menu.phtml
	module/Project/view/partial/navigation.phtml
	module/Project/view/project/index/add.phtml
	module/Project/view/project/index/delete.phtml
	module/Project/view/project/index/edit.phtml
	module/Project/view/project/index/index.phtml
	scripts/project_table.sql
Merge https://github.com/boleal/wpzf2

Conflicts:
	composer.lock
	config/application.config.php
	module/Album/src/Album/Controller/IndexController.php
	module/Contracts/test/Bootstrap.php
	module/Contracts/test/ContractsTest/Controller/ContractsControllerTest.php
	module/Contracts/test/ContractsTest/Model/ContractsTableTest.php
	module/Contracts/test/ContractsTest/Model/ContractsTest.php
	module/Contracts/test/TestConfig.php
	module/Contracts/test/phpunit.xml
Merge branch 'master' of https://github.com/agustincl/wpzf2
config
Merge branch 'master' of https://github.com/agustincl/wpzf2

Conflicts:
	config/application.config.php
	public/.htaccess
Merge
Entities
Cambios a Martes
No changes
Merge branch 'master' of https://github.com/boleal/wpzf2

Conflicts:
	composer.json
	composer.lock
	config/application.config.php
	config/autoload/global.php
	config/autoload/scn-social-auth.global.php
	config/autoload/zfcuser.global.php
	module/Contracts/config/menu.config.php
	module/Contracts/test/Bootstrap.php
	module/Contracts/test/ContractsTest/Controller/ContractsControllerTest.php
	module/Contracts/test/ContractsTest/Model/ContractsTableTest.php
	module/Contracts/test/ContractsTest/Model/ContractsTest.php
	module/Contracts/test/TestConfig.php
	module/Contracts/test/phpunit.xml
	public/.htaccess
	scripts/contracts.sql
	scripts/transactions.sql
	vendor/zf-commons/zfc-base/src/ZfcBase/Db/Adapter/MasterSlaveAdapter.php
Merge branch 'master' of https://github.com/agustincl/wpzf2

Conflicts:
	composer.json
	composer.lock
	config/application.config.php
Merge with originacl