Merge branch 'develop' into 'staging'
Merge develop into staging See merge request !96
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 12 additions, 0 deletions.gitlab-ci.yml
- README.rst 0 additions, 1 deletionREADME.rst
- docs/source/dev/README.rst 6 additions, 0 deletionsdocs/source/dev/README.rst
- docs/source/index.rst 0 additions, 1 deletiondocs/source/index.rst
- docs/source/user/README.rst 0 additions, 5 deletionsdocs/source/user/README.rst
- morph/README.rst 13 additions, 0 deletionsmorph/README.rst
- morph/grid/local/README.rst 111 additions, 0 deletionsmorph/grid/local/README.rst
- morph/grid/local/Vagrantfile 45 additions, 0 deletionsmorph/grid/local/Vagrantfile
- morph/grid/local/config.json 10 additions, 0 deletionsmorph/grid/local/config.json
- morph/grid/local/grid.nix 32 additions, 0 deletionsmorph/grid/local/grid.nix
- morph/grid/local/vagrant-guest.nix 86 additions, 0 deletionsmorph/grid/local/vagrant-guest.nix
- morph/grid/local/virtual-hardware.nix 36 additions, 0 deletionsmorph/grid/local/virtual-hardware.nix
- morph/grid/production/.gitignore 1 addition, 0 deletionsmorph/grid/production/.gitignore
- morph/grid/production/config.json 8 additions, 3 deletionsmorph/grid/production/config.json
- morph/grid/production/grid.nix 2 additions, 2 deletionsmorph/grid/production/grid.nix
- morph/grid/production/users.nix 2 additions, 0 deletionsmorph/grid/production/users.nix
- morph/grid/testing/.gitignore 1 addition, 0 deletionsmorph/grid/testing/.gitignore
- morph/grid/testing/config.json 6 additions, 3 deletionsmorph/grid/testing/config.json
- morph/grid/testing/grid.nix 3 additions, 8 deletionsmorph/grid/testing/grid.nix
- morph/grid/testing/users.nix 2 additions, 0 deletionsmorph/grid/testing/users.nix
Loading
Please register or sign in to comment