Michael RICOIS 93d27f6b46 Merge branch 'master' of ...

ssh://git@192.168.78.249:10022/SCORES/ansible.git

Conflicts:
	apps/odea/rollback.yml

2016-02-05 17:08:25 +01:00

..

tasks

Odea apps : forget files

2016-02-05 16:54:12 +01:00

deploy.yml

Odea apps : forget files

2016-02-05 16:54:12 +01:00

devel-hosts

Odea apps : forget files

2016-02-05 16:54:12 +01:00

ng-deploy.yml

Odea apps : forget files

2016-02-05 16:54:12 +01:00

ng-rollback.yml

Odea apps : forget files

2016-02-05 16:54:12 +01:00

prod-hosts

Odea apps : forget files

2016-02-05 16:54:12 +01:00

rollback.yml

Merge branch 'master' of

2016-02-05 17:08:25 +01:00