• Jérémie Gaidamour's avatar
    Merge branch 'master' into dev · 63e879c6
    Jérémie Gaidamour authored
    Conflicts:
    	generators/input/sites/nancy/clusters/griffon/griffon.rb
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
    	generators/input/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
    63e879c6
griffon-2.yaml 1.91 KB